diff options
| author | Vinnie Okada <vokada@mrvinn.com> | 2015-03-24 20:03:22 -0600 |
|---|---|---|
| committer | Vinnie Okada <vokada@mrvinn.com> | 2015-03-24 20:03:22 -0600 |
| commit | 057c8c344b6518cb50b81607e0f88734fc164a9e (patch) | |
| tree | 996afee0c0f33bd6308f83b330a179dc29dfb48a /app/helpers/projects_helper.rb | |
| parent | 637ca0b388382112850fd3052a961bb07db34d14 (diff) | |
| parent | b9372c999707558b695fa401b4f660a3d38fce86 (diff) | |
| download | gitlab-ce-057c8c344b6518cb50b81607e0f88734fc164a9e.tar.gz | |
Merge branch 'master' into markdown-tags
Diffstat (limited to 'app/helpers/projects_helper.rb')
| -rw-r--r-- | app/helpers/projects_helper.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index a14277180c7..7bf51b5b8e8 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -146,6 +146,10 @@ module ProjectsHelper nav_tabs << feature if project.send :"#{feature}_enabled" end + if project.issues_enabled || project.merge_requests_enabled + nav_tabs << [:milestones, :labels] + end + nav_tabs.flatten end |