diff options
| author | Timothy Andrew <mail@timothyandrew.net> | 2016-06-14 09:06:53 +0530 |
|---|---|---|
| committer | Timothy Andrew <mail@timothyandrew.net> | 2016-06-14 09:06:53 +0530 |
| commit | d0bcba1105686c2306414a402bf33c85a08a17a6 (patch) | |
| tree | 2922086316008cf86e864e1dd8a251fd4878cb04 /app/controllers/application_controller.rb | |
| parent | d754d99179f1ffe846fcc1d8e858163b39efc5dc (diff) | |
| parent | f34af6b83cc2663bb8a076f4df9c82047e5511ab (diff) | |
| download | gitlab-ce-d0bcba1105686c2306414a402bf33c85a08a17a6.tar.gz | |
Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokens
Diffstat (limited to 'app/controllers/application_controller.rb')
| -rw-r--r-- | app/controllers/application_controller.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index e71273e695d..a5b358f10f1 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -6,6 +6,7 @@ class ApplicationController < ActionController::Base include Gitlab::GonHelper include GitlabRoutingHelper include PageLayoutHelper + include WorkhorseHelper before_action :authenticate_user_from_token! before_action :authenticate_user! |