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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
c2f77ee0
Commit
c2f77ee0
authored
Jul 20, 2016
by
Kamil Trzcinski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use Re-deploy button on Deployments page
parent
22c8e21b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
5 deletions
+6
-5
CHANGELOG
CHANGELOG
+1
-0
app/views/projects/deployments/_actions.haml
app/views/projects/deployments/_actions.haml
+1
-1
spec/features/environments_spec.rb
spec/features/environments_spec.rb
+4
-4
No files found.
CHANGELOG
View file @
c2f77ee0
...
@@ -253,6 +253,7 @@ v 8.9.1
...
@@ -253,6 +253,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.
...
...
app/views/projects/deployments/_actions.haml
View file @
c2f77ee0
...
@@ -17,6 +17,6 @@
...
@@ -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?
Re
tr
y
Re
-deplo
y
-
else
-
else
Rollback
Rollback
spec/features/environments_spec.rb
View file @
c2f77ee0
...
@@ -92,8 +92,8 @@ feature 'Environments', feature: true do
...
@@ -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 re
tr
y button for deployment without build'
do
scenario
'does not show a re
-deplo
y button for deployment without build'
do
expect
(
page
).
not_to
have_link
(
'Re
tr
y'
)
expect
(
page
).
not_to
have_link
(
'Re
-deplo
y'
)
end
end
context
'with build'
do
context
'with build'
do
...
@@ -105,8 +105,8 @@ feature 'Environments', feature: true 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 re
tr
y button'
do
scenario
'does show re
-deplo
y button'
do
expect
(
page
).
to
have_link
(
'Re
tr
y'
)
expect
(
page
).
to
have_link
(
'Re
-deplo
y'
)
end
end
context
'with manual action'
do
context
'with manual action'
do
...
...
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