diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-12-08 22:38:29 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-12-08 22:38:29 +0100 |
| commit | fae08104b4f0bfb9612137a4c7313d83a8ba6d84 (patch) | |
| tree | 5b9bf5629e4acc0151614d7ff7f33300420445cb /app/controllers/projects/application_controller.rb | |
| parent | 065375ca2d482faac80897e42d82b3afdcb08d99 (diff) | |
| parent | e616739e2fae12e5358d2cea40089a51468d9b4a (diff) | |
| download | gitlab-ce-fae08104b4f0bfb9612137a4c7313d83a8ba6d84.tar.gz | |
Merge branch 'master' into mr-broken
# Conflicts:
# app/helpers/ci_status_helper.rb
Diffstat (limited to 'app/controllers/projects/application_controller.rb')
| -rw-r--r-- | app/controllers/projects/application_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/application_controller.rb b/app/controllers/projects/application_controller.rb index d3f926b62bc..c2aaf094e68 100644 --- a/app/controllers/projects/application_controller.rb +++ b/app/controllers/projects/application_controller.rb @@ -28,7 +28,7 @@ class Projects::ApplicationController < ApplicationController private - def ci_enabled + def builds_enabled return render_404 unless @project.builds_enabled? end |