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
1beb0dbe
Commit
1beb0dbe
authored
Jun 23, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix admin identities code
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
7390b94d
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
app/controllers/admin/identities_controller.rb
app/controllers/admin/identities_controller.rb
+1
-1
app/views/admin/users/show.html.haml
app/views/admin/users/show.html.haml
+1
-1
No files found.
app/controllers/admin/identities_controller.rb
View file @
1beb0dbe
...
@@ -36,6 +36,6 @@ class Admin::IdentitiesController < Admin::ApplicationController
...
@@ -36,6 +36,6 @@ class Admin::IdentitiesController < Admin::ApplicationController
end
end
def
identity_params
def
identity_params
params
[
:identity
]
.
require
(
:identity
).
permit
(
:provider
,
:extern_uid
)
params
.
require
(
:identity
).
permit
(
:provider
,
:extern_uid
)
end
end
end
end
app/views/admin/users/show.html.haml
View file @
1beb0dbe
-
page_title
@user
.
name
,
"Users"
-
page_title
@user
.
name
,
"Users"
=
render
'admin/users/head'
,
page_name:
'Account'
=
render
'admin/users/head'
.row
.row
.col-md-6
.col-md-6
...
...
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