diff options
| author | Winnie Hellmann <winnie@gitlab.com> | 2017-10-16 20:16:36 +0200 |
|---|---|---|
| committer | Winnie Hellmann <winnie@gitlab.com> | 2017-10-16 21:21:32 +0200 |
| commit | 5868205e5129877eab65bbf701e563dff1fb2807 (patch) | |
| tree | 472e625c30fd49eafea6cee4e5aafd2b61bc10f2 | |
| parent | c8b9c890fd44c0b41f269368387e7bc750ab8e07 (diff) | |
| download | gitlab-ce-winh-project-deletion-message.tar.gz | |
Make confirmation for project deletion more clearwinh-project-deletion-message
| -rw-r--r-- | app/controllers/projects_controller.rb | 2 | ||||
| -rw-r--r-- | spec/features/projects_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 435edb8ff86..ef438770e1b 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -124,7 +124,7 @@ class ProjectsController < Projects::ApplicationController return access_denied! unless can?(current_user, :remove_project, @project) ::Projects::DestroyService.new(@project, current_user, {}).async_execute - flash[:notice] = _("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 diff --git a/spec/features/projects_spec.rb b/spec/features/projects_spec.rb index 4b2c54d54b5..d4e7930fe85 100644 --- a/spec/features/projects_spec.rb +++ b/spec/features/projects_spec.rb @@ -138,7 +138,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 |