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
fc68a3ae
Commit
fc68a3ae
authored
Oct 17, 2017
by
Winnie Hellmann
Committed by
Annabel Dunstone Gray
Oct 17, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change project deletion message from alert to notice
parent
75fb4af6
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/features/projects_spec.rb
spec/features/projects_spec.rb
+1
-1
No files found.
app/controllers/projects_controller.rb
View file @
fc68a3ae
...
...
@@ -125,7 +125,7 @@ class ProjectsController < Projects::ApplicationController
return
access_denied!
unless
can?
(
current_user
,
:remove_project
,
@project
)
::
Projects
::
DestroyService
.
new
(
@project
,
current_user
,
{}).
async_execute
flash
[
:
alert
]
=
_
(
"Project '%{project_name}' will be
deleted."
)
%
{
project_name:
@project
.
name_with_namespace
}
flash
[
:
notice
]
=
_
(
"Project '%{project_name}' is in the process of being
deleted."
)
%
{
project_name:
@project
.
name_with_namespace
}
redirect_to
dashboard_projects_path
,
status:
302
rescue
Projects
::
DestroyService
::
DestroyError
=>
ex
...
...
spec/features/projects_spec.rb
View file @
fc68a3ae
...
...
@@ -139,7 +139,7 @@ feature 'Project' do
it
'removes a project'
do
expect
{
remove_with_confirm
(
'Remove project'
,
project
.
path
)
}.
to
change
{
Project
.
count
}.
by
(
-
1
)
expect
(
page
).
to
have_content
"Project 'test / project1'
will be
deleted."
expect
(
page
).
to
have_content
"Project 'test / project1'
is in the process of being
deleted."
expect
(
Project
.
all
.
count
).
to
be_zero
expect
(
project
.
issues
).
to
be_empty
expect
(
project
.
merge_requests
).
to
be_empty
...
...
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