summaryrefslogtreecommitdiff
path: root/app/controllers/projects/application_controller.rb
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-02-05 12:34:51 +0100
committerRémy Coutable <remy@rymai.me>2016-02-05 15:40:44 +0100
commitf6d816f9fe5dae55ed980b48aac7366c46f95461 (patch)
tree572297b08e690901543ade9c3218e4709c026f70 /app/controllers/projects/application_controller.rb
parentcf1349adb7cba2e791a1f8d59e3a6a976b54e071 (diff)
downloadgitlab-ce-f6d816f9fe5dae55ed980b48aac7366c46f95461.tar.gz
Add a controller test for the new 'diff_view' cookie
Diffstat (limited to 'app/controllers/projects/application_controller.rb')
-rw-r--r--app/controllers/projects/application_controller.rb4
1 files changed, 1 insertions, 3 deletions
diff --git a/app/controllers/projects/application_controller.rb b/app/controllers/projects/application_controller.rb
index 9096910b82c..a326bc58215 100644
--- a/app/controllers/projects/application_controller.rb
+++ b/app/controllers/projects/application_controller.rb
@@ -26,15 +26,13 @@ class Projects::ApplicationController < ApplicationController
end
end
- protected
+ private
def apply_diff_view_cookie!
view = params[:view] || cookies[:diff_view]
cookies.permanent[:diff_view] = params[:view] = view if view
end
- private
-
def builds_enabled
return render_404 unless @project.builds_enabled?
end