root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Address review comments 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
This commit is contained in:
Dmitriy Zaporozhets 2015-06-22 18:01:52 +02:00
parent 73e003013f
commit d7553d3630
No known key found for this signature in database
GPG Key ID: 161B5D6A44D3D88A
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/controllers/admin/identities_controller.rb
View File

@ -18,12 +18,10 @@ class Admin::IdentitiesController < Admin::ApplicationController
end end
def destroy def destroy
respond_to do |format|
if @identity.destroy if @identity.destroy
format.html { redirect_to admin_user_identities_path(@user), notice: 'User identity was successfully removed.' } redirect_to admin_user_identities_path(@user), notice: 'User identity was successfully removed.'
else else
format.html { redirect_to admin_user_identities_path(@user), alert: 'Failed to remove user identity.' } redirect_to admin_user_identities_path(@user), alert: 'Failed to remove user identity.'
end
end end
end end
@ -38,6 +36,6 @@ class Admin::IdentitiesController < Admin::ApplicationController
end end
def identity_params def identity_params
params[:identity].permit(:provider, :extern_uid) params[:identity].require(:identity).permit(:provider, :extern_uid)
end end
end end