summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-06-10 19:05:55 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-06-10 19:15:23 +0300
commit95f15b14d19203e99cb1e25c8c40edb61bf914e5 (patch)
treeff436d0799ecaf843d6943101ae11d0041db6dba
parentd4b2f5d0f3baf4e3644c0e0f71ffb2995fb72a57 (diff)
downloadgitlab-ce-95f15b14d19203e99cb1e25c8c40edb61bf914e5.tar.gz
Render issues link on issues subnav unless you visit merge request controller
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-rw-r--r--app/views/projects/issues/_head.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/issues/_head.html.haml b/app/views/projects/issues/_head.html.haml
index 583cc1b975b..166dae248b6 100644
--- a/app/views/projects/issues/_head.html.haml
+++ b/app/views/projects/issues/_head.html.haml
@@ -1,6 +1,6 @@
%ul.nav-links.sub-nav
%div{ class: (container_class) }
- - if project_nav_tab?(:issues) && current_controller?(:issues)
+ - if project_nav_tab?(:issues) && !current_controller?(:merge_requests)
= nav_link(controller: :issues) do
= link_to url_for_project_issues(@project, only_path: true), title: 'Issues' do
%span