Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2016-03-12 07:38:25 +0300
committerRobert Speicher <rspeicher@gmail.com>2016-03-13 23:51:09 +0300
commit8f21e2ae408a4ebd0e115846b9a639e7ce09a126 (patch)
treea5f6c45a79b30ab6c9d8afab117c3c534dd0cbfd /app/controllers/profiles_controller.rb
parent9f673aa498fed240db5c408b10d9107cec938aa3 (diff)
Let `oauth/applications#index` handle the `profiles#applications` route
Previously we were doing all of kinds of code gymnastics and flash abuse in order to work with a Doorkeeper controller but have it _appear_ at the `/profile/applications` path. Fortunately we can just tell Rails to use a different controller to handle that route, and we get the best of both worlds.
Diffstat (limited to 'app/controllers/profiles_controller.rb')
-rw-r--r--app/controllers/profiles_controller.rb8
1 files changed, 0 insertions, 8 deletions
diff --git a/app/controllers/profiles_controller.rb b/app/controllers/profiles_controller.rb
index 75eb9bdb96f..50b8f38eecb 100644
--- a/app/controllers/profiles_controller.rb
+++ b/app/controllers/profiles_controller.rb
@@ -8,14 +8,6 @@ class ProfilesController < Profiles::ApplicationController
def show
end
- def applications
- @applications = current_user.oauth_applications
- @authorized_tokens = current_user.oauth_authorized_tokens
- @authorized_anonymous_tokens = @authorized_tokens.reject(&:application)
- @authorized_apps = @authorized_tokens.map(&:application).uniq - [nil]
- @application = flash[:application] || Doorkeeper::Application.new
- end
-
def update
user_params.except!(:email) if @user.ldap_user?