summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2015-08-14 08:51:49 -0700
committerStan Hu <stanhu@gmail.com>2015-08-14 08:51:49 -0700
commitd416a9d62428bbb26c3c6bfb2e4a1f99d275e5ce (patch)
treee762177c9517a5ec9e8b35d0c1ae833c06e53d1c /app
parent58247662528e992e08cc905038bbdd47dfcc9ea9 (diff)
parent3483024d93b9ca56e0bddffbbd0aff5714eb2833 (diff)
downloadgitlab-ce-d416a9d62428bbb26c3c6bfb2e4a1f99d275e5ce.tar.gz
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
Diffstat (limited to 'app')
-rw-r--r--app/controllers/projects/issues_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb
index bfafdeeb1fb..0f89f2e88cc 100644
--- a/app/controllers/projects/issues_controller.rb
+++ b/app/controllers/projects/issues_controller.rb
@@ -131,7 +131,7 @@ class Projects::IssuesController < Projects::ApplicationController
end
def module_enabled
- return render_404 unless @project.issues_enabled
+ return render_404 unless @project.issues_enabled && @project.default_issues_tracker?
end
# Since iids are implemented only in 6.1