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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
edfc7d0d
Commit
edfc7d0d
authored
Mar 19, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #8974 from duduribeiro/add_error_message_in_profile
Add error message when have error on profile screen
parents
b99221e6
24354761
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
1 deletion
+3
-1
CHANGELOG
CHANGELOG
+1
-0
app/controllers/profiles_controller.rb
app/controllers/profiles_controller.rb
+2
-1
No files found.
CHANGELOG
View file @
edfc7d0d
...
@@ -12,6 +12,7 @@ v 7.10.0 (unreleased)
...
@@ -12,6 +12,7 @@ v 7.10.0 (unreleased)
- Fix alignment of navbar toggle button (Cody Mize)
- Fix alignment of navbar toggle button (Cody Mize)
- Identical look of selectboxes in UI
- Identical look of selectboxes in UI
- Move "Import existing repository by URL" option to button.
- Move "Import existing repository by URL" option to button.
- Improve error message when save profile has error.
v 7.9.0 (unreleased)
v 7.9.0 (unreleased)
- Add HipChat integration documentation (Stan Hu)
- Add HipChat integration documentation (Stan Hu)
...
...
app/controllers/profiles_controller.rb
View file @
edfc7d0d
...
@@ -25,7 +25,8 @@ class ProfilesController < ApplicationController
...
@@ -25,7 +25,8 @@ class ProfilesController < ApplicationController
if
@user
.
update_attributes
(
user_params
)
if
@user
.
update_attributes
(
user_params
)
flash
[
:notice
]
=
"Profile was successfully updated"
flash
[
:notice
]
=
"Profile was successfully updated"
else
else
flash
[
:alert
]
=
"Failed to update profile"
messages
=
@user
.
errors
.
full_messages
.
uniq
.
join
(
'. '
)
flash
[
:alert
]
=
"Failed to update profile.
#{
messages
}
"
end
end
respond_to
do
|
format
|
respond_to
do
|
format
|
...
...
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