diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-10-26 12:55:03 -0500 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-10-26 13:02:53 -0500 |
| commit | 0e1c4ab9073088910ace698e9e2169ed24ca54d2 (patch) | |
| tree | 90979d0352b873098bb5ba7ccd0e15939fc0b555 | |
| parent | a31053af3d3efdcf03da1115452aadd2927a9f83 (diff) | |
| download | gitlab-ce-0e1c4ab9073088910ace698e9e2169ed24ca54d2.tar.gz | |
Rename retry link and update changelog
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/builds.scss | 2 | ||||
| -rw-r--r-- | app/views/projects/builds/_sidebar.html.haml | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 1049551239c..2dd6a0138a2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ Please view this file on the master branch, on stable branches it's out of date. - API: Fix project deploy keys 400 and 500 errors when adding an existing key. !6784 (Joshua Welsh) - Replace jquery.cookie plugin with js.cookie !7085 - Use MergeRequestsClosingIssues cache data on Issue#closed_by_merge_requests method + - Add `Retry build` button in build page header on desktop - Fix Sign in page 'Forgot your password?' link overlaps on medium-large screens - Show full status link on MR & commit pipelines - Fix documents and comments on Build API `scope` 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: |