summaryrefslogtreecommitdiff
path: root/app/controllers/application_controller.rb
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2016-03-19 17:37:54 -0400
committerRobert Speicher <rspeicher@gmail.com>2016-03-19 17:37:54 -0400
commit085538c2bd817fc083ee9e42c9fdd7f74fc48ecb (patch)
treed7beb73fab81ab9bf4c1c95fe8dd0e7a0ed29c36 /app/controllers/application_controller.rb
parent3f22a92f4a561543c2249786b695d0c65120455b (diff)
downloadgitlab-ce-085538c2bd817fc083ee9e42c9fdd7f74fc48ecb.tar.gz
Use the configured Kaminari "per page" defaultrs-use-kaminari-default
Diffstat (limited to 'app/controllers/application_controller.rb')
-rw-r--r--app/controllers/application_controller.rb2
1 files changed, 0 insertions, 2 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 1f55b18e0b1..de7d323907a 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -6,8 +6,6 @@ class ApplicationController < ActionController::Base
include GitlabRoutingHelper
include PageLayoutHelper
- PER_PAGE = 20
-
before_action :authenticate_user_from_token!
before_action :authenticate_user!
before_action :validate_user_service_ticket!