diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-12-07 15:26:27 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-12-07 15:26:27 +0000 |
| commit | 45338fb7dc3e15c599305f2fdf59c7ac64fa1ce9 (patch) | |
| tree | b3e3f87171d45e138faada4d4275e94c869b4462 | |
| parent | b7206d4d3ff492f7141f26bfe59e75cb81f6d7e9 (diff) | |
| parent | 693a6c1c9aa49aa70e41b26cb9a1511bc5928663 (diff) | |
| download | gitlab-ce-45338fb7dc3e15c599305f2fdf59c7ac64fa1ce9.tar.gz | |
Merge branch 'fix/new-project-guidelines-styling' into 'master'
Use Markdown styling for new project guidelines
Closes #40886
See merge request gitlab-org/gitlab-ce!15785
| -rw-r--r-- | app/views/projects/new.html.haml | 3 | ||||
| -rw-r--r-- | changelogs/unreleased/fix-new-project-guidelines-styling.yml | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/app/views/projects/new.html.haml b/app/views/projects/new.html.haml index cad7c2e83db..4bb97ecdd16 100644 --- a/app/views/projects/new.html.haml +++ b/app/views/projects/new.html.haml @@ -18,7 +18,8 @@ A project is where you house your files (repository), plan your work (issues), and publish your documentation (wiki), #{link_to 'among other things', help_page_path("user/project/index.md", anchor: "projects-features"), target: '_blank'}. %p All features are enabled when you create a project, but you can disable the ones you don’t need in the project settings. - = brand_new_project_guidelines + .md + = brand_new_project_guidelines .col-lg-9.js-toggle-container %ul.nav-links.gitlab-tabs{ role: 'tablist' } %li.active{ role: 'presentation' } diff --git a/changelogs/unreleased/fix-new-project-guidelines-styling.yml b/changelogs/unreleased/fix-new-project-guidelines-styling.yml new file mode 100644 index 00000000000..a97f5c485d4 --- /dev/null +++ b/changelogs/unreleased/fix-new-project-guidelines-styling.yml @@ -0,0 +1,5 @@ +--- +title: Use Markdown styling for new project guidelines +merge_request: 15785 +author: Markus Koller +type: fixed |