Merge branch 're-deploy-button' into 'master'
Use Re-deploy button on Deployments page ## What does this MR do? Change `Retry` to `Re-deploy` which is more accurate. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## What are the relevant issue numbers? Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/18885 ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5374
This commit is contained in:
commit
bb6bdbed91
3 changed files with 6 additions and 5 deletions
|
@ -255,6 +255,7 @@ v 8.9.1
|
||||||
- Remove width restriction for logo on sign-in page. !4888
|
- Remove width restriction for logo on sign-in page. !4888
|
||||||
- Bump gitlab_git to 10.2.3 to fix false truncated warnings with ISO-8559 files. !4884
|
- Bump gitlab_git to 10.2.3 to fix false truncated warnings with ISO-8559 files. !4884
|
||||||
- Apply selected value as label. !4886
|
- Apply selected value as label. !4886
|
||||||
|
- Change Retry to Re-deploy on Deployments page
|
||||||
- Fix temp file being deleted after the request while importing a GitLab project. !4894
|
- Fix temp file being deleted after the request while importing a GitLab project. !4894
|
||||||
- Fix pagination when sorting by columns with lots of ties (like priority)
|
- Fix pagination when sorting by columns with lots of ties (like priority)
|
||||||
- Implement Subresource Integrity for CSS and JavaScript assets. This prevents malicious assets from loading in the case of a CDN compromise.
|
- Implement Subresource Integrity for CSS and JavaScript assets. This prevents malicious assets from loading in the case of a CDN compromise.
|
||||||
|
|
|
@ -17,6 +17,6 @@
|
||||||
- if local_assigns.fetch(:allow_rollback, false)
|
- if local_assigns.fetch(:allow_rollback, false)
|
||||||
= link_to [:retry, @project.namespace.becomes(Namespace), @project, deployment.deployable], method: :post, class: 'btn btn-build' do
|
= link_to [:retry, @project.namespace.becomes(Namespace), @project, deployment.deployable], method: :post, class: 'btn btn-build' do
|
||||||
- if deployment.last?
|
- if deployment.last?
|
||||||
Retry
|
Re-deploy
|
||||||
- else
|
- else
|
||||||
Rollback
|
Rollback
|
||||||
|
|
|
@ -92,8 +92,8 @@ feature 'Environments', feature: true do
|
||||||
expect(page).to have_link(deployment.short_sha)
|
expect(page).to have_link(deployment.short_sha)
|
||||||
end
|
end
|
||||||
|
|
||||||
scenario 'does not show a retry button for deployment without build' do
|
scenario 'does not show a re-deploy button for deployment without build' do
|
||||||
expect(page).not_to have_link('Retry')
|
expect(page).not_to have_link('Re-deploy')
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'with build' do
|
context 'with build' do
|
||||||
|
@ -105,8 +105,8 @@ feature 'Environments', feature: true do
|
||||||
expect(page).to have_link("#{build.name} (##{build.id})")
|
expect(page).to have_link("#{build.name} (##{build.id})")
|
||||||
end
|
end
|
||||||
|
|
||||||
scenario 'does show retry button' do
|
scenario 'does show re-deploy button' do
|
||||||
expect(page).to have_link('Retry')
|
expect(page).to have_link('Re-deploy')
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'with manual action' do
|
context 'with manual action' do
|
||||||
|
|
Loading…
Reference in a new issue