diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-23 10:26:50 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-23 10:26:50 +0200 |
| commit | 1beb0dbe56438ae513565b1bdc0db7c1d692a156 (patch) | |
| tree | 595216c4e8b01c8a178bd498a4b1783ab46923c8 | |
| parent | 7390b94db2e9273141cebfb99cfdbb03ad2d2f33 (diff) | |
| download | gitlab-ce-1beb0dbe56438ae513565b1bdc0db7c1d692a156.tar.gz | |
Fix admin identities code
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| -rw-r--r-- | app/controllers/admin/identities_controller.rb | 2 | ||||
| -rw-r--r-- | app/views/admin/users/show.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/admin/identities_controller.rb b/app/controllers/admin/identities_controller.rb index 174043f3327..d28614731f9 100644 --- a/app/controllers/admin/identities_controller.rb +++ b/app/controllers/admin/identities_controller.rb @@ -36,6 +36,6 @@ class Admin::IdentitiesController < Admin::ApplicationController end def identity_params - params[:identity].require(:identity).permit(:provider, :extern_uid) + params.require(:identity).permit(:provider, :extern_uid) end end diff --git a/app/views/admin/users/show.html.haml b/app/views/admin/users/show.html.haml index 0b8260964fe..2662b3569ec 100644 --- a/app/views/admin/users/show.html.haml +++ b/app/views/admin/users/show.html.haml @@ -1,5 +1,5 @@ - page_title @user.name, "Users" -= render 'admin/users/head', page_name: 'Account' += render 'admin/users/head' .row .col-md-6 |