diff options
| author | Phil Hughes <me@iamphill.com> | 2016-09-05 09:38:37 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-09-05 09:38:37 +0100 |
| commit | c735c53aae8681d95584d921f12020774e4fd23c (patch) | |
| tree | b84be165a8ed1f95452253747d2f8d5a0ff6bbf3 /app/controllers/application_controller.rb | |
| parent | 85f6244ce852fb6b788ea660c7d0cbe14ec10a20 (diff) | |
| parent | fe3d94e8e2e3f5d54575a7f16440cc1711617d2b (diff) | |
| download | gitlab-ce-build-cancel-spinner.tar.gz | |
Merge branch 'master' into build-cancel-spinnerbuild-cancel-spinner
Diffstat (limited to 'app/controllers/application_controller.rb')
| -rw-r--r-- | app/controllers/application_controller.rb | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index ebc2a4651ba..bd4ba384b29 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -24,7 +24,7 @@ class ApplicationController < ActionController::Base protect_from_forgery with: :exception - helper_method :abilities, :can?, :current_application_settings + helper_method :can?, :current_application_settings helper_method :import_sources_enabled?, :github_import_enabled?, :github_import_configured?, :gitlab_import_enabled?, :gitlab_import_configured?, :bitbucket_import_enabled?, :bitbucket_import_configured?, :google_code_import_enabled?, :fogbugz_import_enabled?, :git_import_enabled?, :gitlab_project_import_enabled? rescue_from Encoding::CompatibilityError do |exception| @@ -97,12 +97,8 @@ class ApplicationController < ActionController::Base current_application_settings.after_sign_out_path.presence || new_user_session_path end - def abilities - Ability.abilities - end - def can?(object, action, subject) - abilities.allowed?(object, action, subject) + Ability.allowed?(object, action, subject) end def access_denied! |