diff options
author | Stan Hu <stanhu@gmail.com> | 2016-04-12 22:39:18 -0700 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2016-04-14 07:24:58 -0700 |
commit | c7e384aab23301ad0ee3559252324fa957d15db3 (patch) | |
tree | d78a59ec9a9da680dcc93508c92a09885069dd7c /app/controllers/application_controller.rb | |
parent | 0c082d5e3a34d787f8b2fea0c22fa4256cf82be3 (diff) | |
download | gitlab-ce-c7e384aab23301ad0ee3559252324fa957d15db3.tar.gz |
Add spec for deletion of authorized OAuth2 application
Closes #14370
Move gon function into its own helper
Diffstat (limited to 'app/controllers/application_controller.rb')
-rw-r--r-- | app/controllers/application_controller.rb | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 97d53acde94..bdf2dd68531 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -158,20 +158,6 @@ class ApplicationController < ActionController::Base end end - def add_gon_variables - gon.api_version = API::API.version - gon.default_avatar_url = URI::join(Gitlab.config.gitlab.url, ActionController::Base.helpers.image_path('no_avatar.png')).to_s - gon.default_issues_tracker = Project.new.default_issue_tracker.to_param - gon.max_file_size = current_application_settings.max_attachment_size - gon.relative_url_root = Gitlab.config.gitlab.relative_url_root - gon.user_color_scheme = Gitlab::ColorSchemes.for_user(current_user).css_class - - if current_user - gon.current_user_id = current_user.id - gon.api_token = current_user.private_token - end - end - def validate_user_service_ticket! return unless signed_in? && session[:service_tickets] |