diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-12-04 20:28:05 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-12-04 20:28:05 +0000 |
| commit | 0e3f6251f56563bfafaee2680d6ea07f863df725 (patch) | |
| tree | e317fed7fceba01d1dc8fb4cd238020e88034cad /app/controllers/profiles | |
| parent | 334068b9dabeb621839ec829ef84a26f948629f5 (diff) | |
| parent | 84352177d454e1a8dfa952efca65558501bd9c7d (diff) | |
| download | gitlab-ce-0e3f6251f56563bfafaee2680d6ea07f863df725.tar.gz | |
Merge branch 'ce-jej/group-saml-unlink-from-account' into 'master'
[CE] Backport GroupSAML unlink changes
See merge request gitlab-org/gitlab-ce!23536
Diffstat (limited to 'app/controllers/profiles')
| -rw-r--r-- | app/controllers/profiles/accounts_controller.rb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/app/controllers/profiles/accounts_controller.rb b/app/controllers/profiles/accounts_controller.rb index cb3180f4196..b0d65f284af 100644 --- a/app/controllers/profiles/accounts_controller.rb +++ b/app/controllers/profiles/accounts_controller.rb @@ -4,7 +4,7 @@ class Profiles::AccountsController < Profiles::ApplicationController include AuthHelper def show - @user = current_user + render(locals: show_view_variables) end # rubocop: disable CodeReuse/ActiveRecord @@ -23,4 +23,10 @@ class Profiles::AccountsController < Profiles::ApplicationController redirect_to profile_account_path end # rubocop: enable CodeReuse/ActiveRecord + + private + + def show_view_variables + {} + end end |