summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Reigel <alexis.reigel.ext@siemens.com>2018-09-12 17:31:25 +0200
committerAlexis Reigel <alexis.reigel.ext@siemens.com>2018-09-12 17:31:25 +0200
commit03890558b47f1bad215807c1ce84cb99043aa01e (patch)
tree3d6898edbe513b018f9b532e372782e8a1272176
parent27aeaccb6cdf51294302cf1435b45900942145d7 (diff)
downloadgitlab-ce-03890558b47f1bad215807c1ce84cb99043aa01e.tar.gz
rename variable from *_cnt to *_count
-rw-r--r--app/controllers/admin/runners_controller.rb2
-rw-r--r--app/views/admin/runners/index.html.haml2
-rw-r--r--locale/gitlab.pot2
3 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/admin/runners_controller.rb b/app/controllers/admin/runners_controller.rb
index 7b6517722ce..fbc7fa6148c 100644
--- a/app/controllers/admin/runners_controller.rb
+++ b/app/controllers/admin/runners_controller.rb
@@ -4,7 +4,7 @@ class Admin::RunnersController < Admin::ApplicationController
def index
finder = Admin::RunnersFinder.new(params: params)
@runners = finder.execute
- @active_runners_cnt = Ci::Runner.online.count
+ @active_runners_count = Ci::Runner.online.count
@sort = finder.sort_key
end
diff --git a/app/views/admin/runners/index.html.haml b/app/views/admin/runners/index.html.haml
index 09a449d57c4..4dc076c95c5 100644
--- a/app/views/admin/runners/index.html.haml
+++ b/app/views/admin/runners/index.html.haml
@@ -47,7 +47,7 @@
.bs-callout
%p
- = _('Runners currently online: %{active_runners_cnt}') % { active_runners_cnt: @active_runners_cnt }
+ = _('Runners currently online: %{active_runners_count}') % { active_runners_count: @active_runners_count }
.row-content-block.second-block
= form_tag admin_runners_path, id: 'runners-search', method: :get, class: 'filter-form js-filter-form' do
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 029fd2ae132..7540f7f8acf 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -4870,7 +4870,7 @@ msgstr ""
msgid "Runners can be placed on separate users, servers, even on your local machine."
msgstr ""
-msgid "Runners currently online: %{active_runners_cnt}"
+msgid "Runners currently online: %{active_runners_count}"
msgstr ""
msgid "Runners page"