diff options
| author | Phil Hughes <me@iamphill.com> | 2016-09-05 09:38:37 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-09-05 09:38:37 +0100 |
| commit | c735c53aae8681d95584d921f12020774e4fd23c (patch) | |
| tree | b84be165a8ed1f95452253747d2f8d5a0ff6bbf3 /app/controllers/projects/labels_controller.rb | |
| parent | 85f6244ce852fb6b788ea660c7d0cbe14ec10a20 (diff) | |
| parent | fe3d94e8e2e3f5d54575a7f16440cc1711617d2b (diff) | |
| download | gitlab-ce-build-cancel-spinner.tar.gz | |
Merge branch 'master' into build-cancel-spinnerbuild-cancel-spinner
Diffstat (limited to 'app/controllers/projects/labels_controller.rb')
| -rw-r--r-- | app/controllers/projects/labels_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/labels_controller.rb b/app/controllers/projects/labels_controller.rb index 0ca675623e5..28fa4a5b141 100644 --- a/app/controllers/projects/labels_controller.rb +++ b/app/controllers/projects/labels_controller.rb @@ -99,7 +99,7 @@ class Projects::LabelsController < Projects::ApplicationController protected def module_enabled - unless @project.issues_enabled || @project.merge_requests_enabled + unless @project.feature_available?(:issues, current_user) || @project.feature_available?(:merge_requests, current_user) return render_404 end end |