summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClement Ho <clemmakesapps@gmail.com>2017-01-10 00:56:22 +0000
committerClement Ho <clemmakesapps@gmail.com>2017-01-10 00:56:22 +0000
commitbb02141e417ff21deb7707a806a313545bbdd5af (patch)
tree0ef486ee8c00789e050bc597ffacb9e35722ffe7
parent2f1701c56a7ce6ee2870bd6a280cf5bf788bd607 (diff)
parente98ad707fd61b9f353eff24c2a388c702d8088ca (diff)
downloadgitlab-ce-bb02141e417ff21deb7707a806a313545bbdd5af.tar.gz
Merge branch '26129-add-link-to-branches-page' into 'master'
Resolve "Add link to Branches page help text?" Closes #26129 See merge request !8377
-rw-r--r--app/views/projects/branches/index.html.haml3
-rw-r--r--changelogs/unreleased/26129-add-link-to-branches-page.yml4
2 files changed, 6 insertions, 1 deletions
diff --git a/app/views/projects/branches/index.html.haml b/app/views/projects/branches/index.html.haml
index ecd812312c0..5f8f56150f9 100644
--- a/app/views/projects/branches/index.html.haml
+++ b/app/views/projects/branches/index.html.haml
@@ -5,7 +5,8 @@
%div{ class: container_class }
.top-area.adjust
.nav-text
- Protected branches can be managed in project settings
+ Protected branches can be managed in
+ = link_to 'project settings', namespace_project_protected_branches_path(@project.namespace, @project)
.nav-controls
= form_tag(filter_branches_path, method: :get) do
diff --git a/changelogs/unreleased/26129-add-link-to-branches-page.yml b/changelogs/unreleased/26129-add-link-to-branches-page.yml
new file mode 100644
index 00000000000..aceb92dbb9c
--- /dev/null
+++ b/changelogs/unreleased/26129-add-link-to-branches-page.yml
@@ -0,0 +1,4 @@
+---
+title: Convert project setting text into protected branch path link
+merge_request: 8377
+author: Ken Ding