summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2016-10-26 12:55:03 -0500
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2016-10-26 13:02:53 -0500
commit0e1c4ab9073088910ace698e9e2169ed24ca54d2 (patch)
tree90979d0352b873098bb5ba7ccd0e15939fc0b555 /app
parenta31053af3d3efdcf03da1115452aadd2927a9f83 (diff)
downloadgitlab-ce-0e1c4ab9073088910ace698e9e2169ed24ca54d2.tar.gz
Rename retry link and update changelog
Diffstat (limited to 'app')
-rw-r--r--app/assets/stylesheets/pages/builds.scss2
-rw-r--r--app/views/projects/builds/_sidebar.html.haml2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/stylesheets/pages/builds.scss b/app/assets/stylesheets/pages/builds.scss
index 48e25b3312e..a73b8908f60 100644
--- a/app/assets/stylesheets/pages/builds.scss
+++ b/app/assets/stylesheets/pages/builds.scss
@@ -155,7 +155,7 @@
}
@media (max-width: $screen-sm-max) {
- display: inline-block;
+ display: block;
}
}
diff --git a/app/views/projects/builds/_sidebar.html.haml b/app/views/projects/builds/_sidebar.html.haml
index b1053028279..28f519f11b2 100644
--- a/app/views/projects/builds/_sidebar.html.haml
+++ b/app/views/projects/builds/_sidebar.html.haml
@@ -44,7 +44,7 @@
.title
Build details
- if can?(current_user, :update_build, @build) && @build.retryable?
- = link_to "Retry", retry_namespace_project_build_path(@project.namespace, @project, @build), class: 'pull-right retry-link', method: :post
+ = link_to "Retry build", retry_namespace_project_build_path(@project.namespace, @project, @build), class: 'pull-right retry-link', method: :post
- if @build.merge_request
%p.build-detail-row
%span.build-light-text Merge Request: