Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
d7553d36
Commit
d7553d36
authored
Jun 22, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Address review comments
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
73e00301
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
7 deletions
+5
-7
app/controllers/admin/identities_controller.rb
app/controllers/admin/identities_controller.rb
+5
-7
No files found.
app/controllers/admin/identities_controller.rb
View file @
d7553d36
...
@@ -18,12 +18,10 @@ class Admin::IdentitiesController < Admin::ApplicationController
...
@@ -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
...
@@ -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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment