Skip to content

GitLab

  • Menu
Projects Groups Snippets
    • Loading...
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in
  • G gitlabhq1
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 21
    • Issues 21
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 12
    • Merge requests 12
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Monitor
    • Monitor
    • Incidents
  • Packages & Registries
    • Packages & Registries
    • Package Registry
    • Infrastructure Registry
  • Analytics
    • Analytics
    • CI/CD
    • Repository
    • Value stream
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • gpt
  • large_projects
  • gitlabhq1
  • Merge requests
  • !4251

Closed
Created 12 years ago by Administrator@rootOwner
  • Report abuse
Report abuse

Fix rendering of README.txt on tree page. See #1676

  • Overview 2
  • Commits 1
  • Changes 1

Created by: dfyx

I posted an incorrect Pull Request a few minutes ago. Ignore that one. This is the correct one when merging into master

Previously, only files that where named exactly "README" were rendered as plaintext. Files named "Readme", "README.txt" or something similar were incorrectly handled as Markdown which resulted in a missing <pre> tag

Consider this to be a quick and dirty fix. A cleaner version would be to share a partial between app/views/tree/_tree.html.haml and app/views/blob/_text.html.haml instead of having app/views/tree/_readme.html.haml. This woukd ensure that file rendering is consistent between those two pages but I'm not that fluent in HAML and your testing workflow.

  • You're only seeing other activity in the feed. To add a comment, switch to one of the following options.
Please register or sign in to reply
Compare
  • master (base)

and
  • latest version
    2d7eb057
    1 commit, 5 years ago

There are merge conflicts

The comparison view may be inaccurate due to merge conflicts.

Resolve these conflicts or ask someone with write access to this repository to merge it locally.

0 Assignees
Assign to
0 Reviewers
Request review from
Milestone
No milestone
None
None
Time tracking
0
Labels
None
Assign labels
  • No matching results
  • Manage project labels
Lock merge request
Unlocked
participants
Reference:
Source branch: github/fork/dfyx/patch-2

    0 pending comments