diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-09-13 16:14:06 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-09-13 16:14:06 +0000 |
| commit | 3e10e048ccb829ea6e705b6525df60083d19f347 (patch) | |
| tree | 73026264b4df539f147931d958f7d0e6ed42458b /app | |
| parent | 33010da28b0f2e00e96cc4bf6c439363905a81d5 (diff) | |
| parent | 360b60bea7b2685278a93e0979790d7a5b0c421b (diff) | |
| download | gitlab-ce-3e10e048ccb829ea6e705b6525df60083d19f347.tar.gz | |
Merge branch 'ce-backport-new-sidebar-boards' into 'master'
CE backport of new-sidebar-boards
See merge request !14246
Diffstat (limited to 'app')
| -rw-r--r-- | app/helpers/boards_helper.rb | 4 | ||||
| -rw-r--r-- | app/views/layouts/nav/sidebar/_project.html.haml | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/app/helpers/boards_helper.rb b/app/helpers/boards_helper.rb index 4bd61aa8f86..62ac208f16a 100644 --- a/app/helpers/boards_helper.rb +++ b/app/helpers/boards_helper.rb @@ -77,4 +77,8 @@ module BoardsHelper 'max-select': dropdown_options[:data][:'max-select'] } end + + def boards_link_text + _("Board") + end end diff --git a/app/views/layouts/nav/sidebar/_project.html.haml b/app/views/layouts/nav/sidebar/_project.html.haml index 9589e81c750..5f7a2d86c0f 100644 --- a/app/views/layouts/nav/sidebar/_project.html.haml +++ b/app/views/layouts/nav/sidebar/_project.html.haml @@ -114,9 +114,9 @@ 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 - Board + = boards_link_text .feature-highlight.js-feature-highlight{ disabled: true, data: { trigger: 'manual', container: 'body', toggle: 'popover', placement: 'right', highlight: 'issue-boards' } } .feature-highlight-popover-content = render 'feature_highlight/issue_boards.svg' |