summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKen Ding <ken.ding@mail.com>2017-01-10 05:03:39 +1030
committerKen Ding <ken.ding@mail.com>2017-01-10 05:03:39 +1030
commite98ad707fd61b9f353eff24c2a388c702d8088ca (patch)
tree3482c89f1d87b7d17de5cb64eb563608dd54978f
parent8bacc5bc7e69e95304045a449c69cdd37ac6d5b1 (diff)
downloadgitlab-ce-e98ad707fd61b9f353eff24c2a388c702d8088ca.tar.gz
squash 3 commits
-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