diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-09-13 16:14:06 +0000 |
|---|---|---|
| committer | Jarka Kadlecova <jarka@gitlab.com> | 2017-09-20 13:36:37 +0200 |
| commit | 109f39e29f1994340bad8b9136d77058aba6bb47 (patch) | |
| tree | 5aeb84c23b0d0f4960d01c51c2489d7e65b3383b /app/views/layouts/nav/sidebar/_project.html.haml | |
| parent | 5b92cd7be05aecfb8ebad7ad48d47fd6c4dd3e64 (diff) | |
| download | gitlab-ce-109f39e29f1994340bad8b9136d77058aba6bb47.tar.gz | |
Merge branch 'ce-backport-new-sidebar-boards' into 'master'10-0-stable-prepare-rc5
CE backport of new-sidebar-boards
See merge request !14246
# Conflicts:
# app/views/layouts/nav/sidebar/_project.html.haml
Diffstat (limited to 'app/views/layouts/nav/sidebar/_project.html.haml')
| -rw-r--r-- | app/views/layouts/nav/sidebar/_project.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/layouts/nav/sidebar/_project.html.haml b/app/views/layouts/nav/sidebar/_project.html.haml index 97f3eed9324..518cabbb1a5 100644 --- a/app/views/layouts/nav/sidebar/_project.html.haml +++ b/app/views/layouts/nav/sidebar/_project.html.haml @@ -114,7 +114,7 @@ List = nav_link(controller: :boards) do - = link_to project_boards_path(@project), title: 'Board' do + = link_to project_boards_path(@project), title: boards_link_text do %span = boards_link_text |