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
75bb1087
Commit
75bb1087
authored
Oct 06, 2015
by
Stan Hu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Allow removing of project without confirmation when JavaScript is disabled
Closes #2485
parent
cc8c91a1
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
3 deletions
+4
-3
CHANGELOG
CHANGELOG
+1
-0
app/views/projects/edit.html.haml
app/views/projects/edit.html.haml
+2
-2
spec/features/projects_spec.rb
spec/features/projects_spec.rb
+1
-1
No files found.
CHANGELOG
View file @
75bb1087
...
@@ -2,6 +2,7 @@ Please view this file on the master branch, on stable branches it's out of date.
...
@@ -2,6 +2,7 @@ Please view this file on the master branch, on stable branches it's out of date.
v 8.1.0 (unreleased)
v 8.1.0 (unreleased)
- Add support for creating directories from Files page (Stan Hu)
- Add support for creating directories from Files page (Stan Hu)
- Allow removing of project without confirmation when JavaScript is disabled (Stan Hu)
- Fix bug where transferring a project would result in stale commit links (Stan Hu)
- Fix bug where transferring a project would result in stale commit links (Stan Hu)
- Include full path of source and target branch names in New Merge Request page (Stan Hu)
- Include full path of source and target branch names in New Merge Request page (Stan Hu)
- Add user preference to view activities as default dashboard (Stan Hu)
- Add user preference to view activities as default dashboard (Stan Hu)
...
...
app/views/projects/edit.html.haml
View file @
75bb1087
...
@@ -193,13 +193,13 @@
...
@@ -193,13 +193,13 @@
.panel.panel-default.panel.panel-danger
.panel.panel-default.panel.panel-danger
.panel-heading
Remove project
.panel-heading
Remove project
.panel-body
.panel-body
=
form_tag
(
namespace_project_path
(
@project
.
namespace
,
@project
),
method: :delete
,
html:
{
class:
'form-horizontal'
}
)
do
=
form_tag
(
namespace_project_path
(
@project
.
namespace
,
@project
),
method: :delete
,
class:
'form-horizontal'
)
do
%p
%p
Removing the project will delete its repository and all related resources including issues, merge requests etc.
Removing the project will delete its repository and all related resources including issues, merge requests etc.
%br
%br
%strong
Removed projects cannot be restored!
%strong
Removed projects cannot be restored!
=
link
_to
'Remove project'
,
'#'
,
class:
"btn btn-remove js-confirm-danger"
,
data:
{
"confirm-danger-message"
=>
remove_project_message
(
@project
)
}
=
button
_to
'Remove project'
,
'#'
,
class:
"btn btn-remove js-confirm-danger"
,
data:
{
"confirm-danger-message"
=>
remove_project_message
(
@project
)
}
-
else
-
else
.nothing-here-block
Only project owner can remove a project
.nothing-here-block
Only project owner can remove a project
...
...
spec/features/projects_spec.rb
View file @
75bb1087
...
@@ -50,7 +50,7 @@ feature 'Project', feature: true do
...
@@ -50,7 +50,7 @@ feature 'Project', feature: true do
end
end
def
remove_project
def
remove_project
click_
link
"Remove project"
click_
button
"Remove project"
fill_in
'confirm_name_input'
,
with:
project
.
path
fill_in
'confirm_name_input'
,
with:
project
.
path
click_button
'Confirm'
click_button
'Confirm'
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