Merge branch 'allow-remove-project-without-javascript' into 'master'
Allow removing of project without confirmation when JavaScript is disabled Also fixes up some CSS errors in the `form`. Closes #2485 See merge request !1527
This commit is contained in:
commit
ac378e5b6a
3 changed files with 4 additions and 3 deletions
|
@ -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)
|
||||
- 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)
|
||||
- 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)
|
||||
|
|
|
@ -193,13 +193,13 @@
|
|||
.panel.panel-default.panel.panel-danger
|
||||
.panel-heading Remove project
|
||||
.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
|
||||
Removing the project will delete its repository and all related resources including issues, merge requests etc.
|
||||
%br
|
||||
%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
|
||||
.nothing-here-block Only project owner can remove a project
|
||||
|
||||
|
|
|
@ -50,7 +50,7 @@ feature 'Project', feature: true do
|
|||
end
|
||||
|
||||
def remove_project
|
||||
click_link "Remove project"
|
||||
click_button "Remove project"
|
||||
fill_in 'confirm_name_input', with: project.path
|
||||
click_button 'Confirm'
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue