diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-02-17 22:00:12 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-02-17 22:00:12 +0000 |
| commit | ebbf8f605443e6bde95eed36b5b21d0783015334 (patch) | |
| tree | 8f329945dad4ee519bcc708bd84b4cdbb74b305e | |
| parent | 71377c1aa0a7469f80c489d2da351d5da08d6964 (diff) | |
| parent | 59010d8f822a1d09660ef78a0ceb7f9cf05dbd63 (diff) | |
| download | gitlab-ce-ebbf8f605443e6bde95eed36b5b21d0783015334.tar.gz | |
Merge branch '28353-little-grammar-issue' into 'master'
Fix grammar issue in admin/runners
Closes #28353
See merge request !9344
| -rw-r--r-- | app/views/admin/runners/index.html.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/28353-little-grammar-issue.yml | 4 | ||||
| -rw-r--r-- | spec/features/admin/admin_runners_spec.rb | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/app/views/admin/runners/index.html.haml b/app/views/admin/runners/index.html.haml index 721bc77cc2f..d725e477044 100644 --- a/app/views/admin/runners/index.html.haml +++ b/app/views/admin/runners/index.html.haml @@ -56,7 +56,7 @@ = submit_tag 'Search', class: 'btn' .pull-right.light - Runners with last contact less than a minute ago: #{@active_runners_cnt} + Runners with last contact more than a minute ago: #{@active_runners_cnt} %br diff --git a/changelogs/unreleased/28353-little-grammar-issue.yml b/changelogs/unreleased/28353-little-grammar-issue.yml new file mode 100644 index 00000000000..10bdb17b266 --- /dev/null +++ b/changelogs/unreleased/28353-little-grammar-issue.yml @@ -0,0 +1,4 @@ +--- +title: Fix grammer issue in admin/runners +merge_request: +author: diff --git a/spec/features/admin/admin_runners_spec.rb b/spec/features/admin/admin_runners_spec.rb index f05fbe3d062..5dcc7d35d82 100644 --- a/spec/features/admin/admin_runners_spec.rb +++ b/spec/features/admin/admin_runners_spec.rb @@ -18,7 +18,7 @@ describe "Admin Runners" do it 'has all necessary texts' do expect(page).to have_text "To register a new Runner" - expect(page).to have_text "Runners with last contact less than a minute ago: 1" + expect(page).to have_text "Runners with last contact more than a minute ago: 1" end describe 'search' do |