summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-06-22 18:01:52 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-06-22 18:01:52 +0200
commitd7553d3630d0a60c1b8a100f7c5fbe3ba5745803 (patch)
treeb910f6f05b87803b6fb2583f0745f0f2406c57b4
parent73e003013f1f6f81f3ca3518784d41d608490403 (diff)
downloadgitlab-ce-d7553d3630d0a60c1b8a100f7c5fbe3ba5745803.tar.gz
Address review comments
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-rw-r--r--app/controllers/admin/identities_controller.rb12
1 files changed, 5 insertions, 7 deletions
diff --git a/app/controllers/admin/identities_controller.rb b/app/controllers/admin/identities_controller.rb
index 17ace5a258b..174043f3327 100644
--- a/app/controllers/admin/identities_controller.rb
+++ b/app/controllers/admin/identities_controller.rb
@@ -18,12 +18,10 @@ class Admin::IdentitiesController < Admin::ApplicationController
end
def destroy
- respond_to do |format|
- if @identity.destroy
- format.html { redirect_to admin_user_identities_path(@user), notice: 'User identity was successfully removed.' }
- else
- format.html { redirect_to admin_user_identities_path(@user), alert: 'Failed to remove user identity.' }
- end
+ if @identity.destroy
+ redirect_to admin_user_identities_path(@user), notice: 'User identity was successfully removed.'
+ else
+ redirect_to admin_user_identities_path(@user), alert: 'Failed to remove user identity.'
end
end
@@ -38,6 +36,6 @@ class Admin::IdentitiesController < Admin::ApplicationController
end
def identity_params
- params[:identity].permit(:provider, :extern_uid)
+ params[:identity].require(:identity).permit(:provider, :extern_uid)
end
end