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
  • !7466

Merged
Created Aug 10, 2014 by Administrator@rootOwner

Improve readme markup, fixes #7455

  • Overview 14
  • Commits 4
  • Changes 8

Created by: Razer6

What does this MR do?
  • Render readme markup rendering fails, throw no 500 error
  • Render readme we support if there are multiple readmes in repo
  • Render readme with simple_format if we don't have a proper render, to preserve style
Why was this MR needed?
  • Currently, if markup fails for some reason, GitLab displays a 500 error.
  • If we've a readme without a render, readme looks ugly
What are the relevant issue numbers?

This PR fixes

  • #7455 (closed).
  • http://stackoverflow.com/questions/25169393/gitlab-rendering-the-wrong-readme-in-project-public-views/25193268#25193268

It's also related to #7023 (closed) and https://gitlab.com/gitlab-org/gitlab-ce/issues/296 /cc @jacobvosmaer

@jvanbaarsen Could you review?

Assignee
Assign to
Reviewer
Request review from
Time tracking
Source branch: github/fork/Razer6/improve_markup_handling