diff options
| author | Nick Thomas <nick@gitlab.com> | 2019-03-20 19:08:05 +0300 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2019-03-20 19:08:05 +0300 |
| commit | 4249eac3058fbc57724feb04b98a547732ca5959 (patch) | |
| tree | 64fdca86085444bfb4b9b30760256705e2c84666 /app/controllers/profiles | |
| parent | 9820cdaf8e985c338ecbd4c6659479551a7518f7 (diff) | |
| parent | 8ee1927db90d43205b4e6f8bd13f209c74b41bd1 (diff) | |
Merge branch 'create-identity-provider-policy' into 'master'
Move out link\unlink ability checks to a policy
See merge request gitlab-org/gitlab-ce!26278
Diffstat (limited to 'app/controllers/profiles')
| -rw-r--r-- | app/controllers/profiles/accounts_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/profiles/accounts_controller.rb b/app/controllers/profiles/accounts_controller.rb index b0d65f284af..0d2a6145d0e 100644 --- a/app/controllers/profiles/accounts_controller.rb +++ b/app/controllers/profiles/accounts_controller.rb @@ -14,7 +14,7 @@ class Profiles::AccountsController < Profiles::ApplicationController return render_404 unless identity - if unlink_allowed?(provider) + if unlink_provider_allowed?(provider) identity.destroy else flash[:alert] = "You are not allowed to unlink your primary login account" |