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
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
968809dc
Commit
968809dc
authored
Jun 15, 2017
by
James Lopez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix profiles controller
parent
aa158dd7
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
app/controllers/profiles_controller.rb
app/controllers/profiles_controller.rb
+2
-2
No files found.
app/controllers/profiles_controller.rb
View file @
968809dc
...
@@ -14,7 +14,7 @@ class ProfilesController < Profiles::ApplicationController
...
@@ -14,7 +14,7 @@ class ProfilesController < Profiles::ApplicationController
respond_to
do
|
format
|
respond_to
do
|
format
|
result
=
Users
::
UpdateService
.
new
(
current_user
,
@user
,
user_params
).
execute
result
=
Users
::
UpdateService
.
new
(
current_user
,
@user
,
user_params
).
execute
if
result
[
:s
uccess
]
if
result
[
:s
tatus
]
==
:success
message
=
"Profile was successfully updated"
message
=
"Profile was successfully updated"
format
.
html
{
redirect_back_or_default
(
default:
{
action:
'show'
},
options:
{
notice:
message
})
}
format
.
html
{
redirect_back_or_default
(
default:
{
action:
'show'
},
options:
{
notice:
message
})
}
...
@@ -65,7 +65,7 @@ class ProfilesController < Profiles::ApplicationController
...
@@ -65,7 +65,7 @@ class ProfilesController < Profiles::ApplicationController
def
update_username
def
update_username
result
=
Users
::
UpdateService
.
new
(
current_user
,
@user
,
username:
user_params
[
:username
]).
execute
result
=
Users
::
UpdateService
.
new
(
current_user
,
@user
,
username:
user_params
[
:username
]).
execute
options
=
if
result
[
:s
uccess
]
options
=
if
result
[
:s
tatus
]
==
:success
{
notice:
"Username successfully changed"
}
{
notice:
"Username successfully changed"
}
else
else
{
alert:
"Username change failed -
#{
result
[
:message
]
}
"
}
{
alert:
"Username change failed -
#{
result
[
:message
]
}
"
}
...
...
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