diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-08-09 17:44:34 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-08-09 17:46:25 +0200 |
| commit | 78fba275c9bb052f666ea453068d7557200a634c (patch) | |
| tree | 3ba7416c23a61d77586fe93ad8dd9276334f1fe2 | |
| parent | 7b7802377e49bbf94f167cbf483f006ad614aa27 (diff) | |
| download | gitlab-ce-mr-widget-text.tar.gz | |
More textual tweaksmr-widget-text
3 files changed, 6 insertions, 5 deletions
diff --git a/app/views/projects/merge_requests/widget/_heading.html.haml b/app/views/projects/merge_requests/widget/_heading.html.haml index 5c6827b54c4..4d4e2f68f61 100644 --- a/app/views/projects/merge_requests/widget/_heading.html.haml +++ b/app/views/projects/merge_requests/widget/_heading.html.haml @@ -3,6 +3,7 @@ - [:success, :skipped, :canceled, :failed, :running, :pending].each do |status| .ci_widget{class: "ci-#{status}", style: "display:none"} - if status == :success + - status = "passed" = icon("check-circle") - else = icon("circle") @@ -13,15 +14,15 @@ .ci_widget = icon("spinner spin") - Checking CI status for #{@merge_request.last_commit_short_sha} + Checking CI status for #{@merge_request.last_commit_short_sha}… .ci_widget.ci-not_found{style: "display:none"} = icon("times-circle") - %span Cannot find status on the CI server for #{@merge_request.last_commit_short_sha}. + Could not find CI status for #{@merge_request.last_commit_short_sha}. .ci_widget.ci-error{style: "display:none"} = icon("times-circle") - %span Cannot connect to the CI server. Please check your settings and try again. + Could not connect to the CI server. Please check your settings and try again. :coffeescript $ -> diff --git a/app/views/projects/merge_requests/widget/_locked.html.haml b/app/views/projects/merge_requests/widget/_locked.html.haml index 300a70d733a..78d0783cba0 100644 --- a/app/views/projects/merge_requests/widget/_locked.html.haml +++ b/app/views/projects/merge_requests/widget/_locked.html.haml @@ -3,7 +3,7 @@ .mr-widget-body %h4 = icon("spinner spin") - Merge in progress... + Merge in progress… %p This merge request is in the process of being merged, during which time it is locked and cannot be closed. diff --git a/app/views/projects/merge_requests/widget/open/_check.html.haml b/app/views/projects/merge_requests/widget/open/_check.html.haml index 1fb0023ad1c..b6b8974297e 100644 --- a/app/views/projects/merge_requests/widget/open/_check.html.haml +++ b/app/views/projects/merge_requests/widget/open/_check.html.haml @@ -1,6 +1,6 @@ %strong = icon("spinner spin") - Checking ability to merge automatically... + Checking ability to merge automatically… :coffeescript $ -> |