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
Léo-Paul Géneau
gitlab-ce
Commits
0d22b214
Commit
0d22b214
authored
Jun 25, 2018
by
Aram Visser
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Set flash error message only for current request when updating project
parent
2bac2918
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
app/controllers/projects_controller.rb
app/controllers/projects_controller.rb
+1
-1
spec/controllers/projects_controller_spec.rb
spec/controllers/projects_controller_spec.rb
+1
-1
No files found.
app/controllers/projects_controller.rb
View file @
0d22b214
...
@@ -63,7 +63,7 @@ class ProjectsController < Projects::ApplicationController
...
@@ -63,7 +63,7 @@ class ProjectsController < Projects::ApplicationController
redirect_to
(
edit_project_path
(
@project
))
redirect_to
(
edit_project_path
(
@project
))
end
end
else
else
flash
[
:alert
]
=
result
[
:message
]
flash
.
now
[
:alert
]
=
result
[
:message
]
format
.
html
{
render
'edit'
}
format
.
html
{
render
'edit'
}
end
end
...
...
spec/controllers/projects_controller_spec.rb
View file @
0d22b214
...
@@ -329,7 +329,7 @@ describe ProjectsController do
...
@@ -329,7 +329,7 @@ describe ProjectsController do
expect
{
update_project
path:
'renamed_path'
}
expect
{
update_project
path:
'renamed_path'
}
.
not_to
change
{
project
.
reload
.
path
}
.
not_to
change
{
project
.
reload
.
path
}
expect
(
controller
).
to
set_flash
[
:alert
].
to
(
/container registry tags/
)
expect
(
controller
).
to
set_flash
.
now
[
:alert
].
to
(
/container registry tags/
)
expect
(
response
).
to
have_gitlab_http_status
(
200
)
expect
(
response
).
to
have_gitlab_http_status
(
200
)
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