Simplify runner registration token resetting

This icommit adds several changes related to the same topic
- resetting a Runner registration token:

1. On Project settings page it adds a button for resetting the
   registration token and it removes the Runner token field
   that was confusing all GitLab users.

2. On Group settings page it adds the same button for resetting
   the registration token.

3. On Admin Runners settings page it moves the button to the same
   place as in Project and Group settings and it changes slightly
   the page layout to make it more similar to Group and Project
   setting pages.

4. It refactorizes a little the partial that prints runner
   registration description. Thanks to this Project, Group
   and Admin settings of the Runner are re-using the same
   code to generate the button.

5. Updates the translations of changed text.

app/controllers/admin/application_settings_controller.rb

@@ -67,8 +67,9 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
     end
   end
-  def reset_runners_token
+  def reset_registration_token
     @application_setting.reset_runners_registration_token!
+
     flash[:notice] = 'New runners registration token has been generated!'
     redirect_to admin_runners_path
   end

app/controllers/groups/settings/ci_cd_controller.rb

@@ -10,6 +10,13 @@ module Groups
         define_secret_variables
       end
+      def reset_registration_token
+        @group.reset_runners_token!
+
+        flash[:notice] = 'New runners registration token has been generated!'
+        redirect_to group_settings_ci_cd_path
+      end
+
       private
       def define_secret_variables

app/controllers/projects/settings/ci_cd_controller.rb

@@ -36,6 +36,13 @@ module Projects
         end
       end
+      def reset_registration_token
+        @project.reset_runners_token!
+
+        flash[:notice] = 'New runners registration token has been generated!'
+        redirect_to namespace_project_settings_ci_cd_path
+      end
+
       private
       def update_params

app/views/admin/runners/index.html.haml

@@ -2,106 +2,103 @@
 - @no_container = true
 %div{ class: container_class }
-  .bs-callout
-    %p
-      = (_"A 'Runner' is a process which runs a job. You can set up as many Runners as you need.")
-      %br
-      = _('Runners can be placed on separate users, servers, even on your local machine.')
-      %br
-    %div
-      %span= _('Each Runner can be in one of the following states:')
-      %ul
-        %li
-          %span.badge.badge-success shared
-          \-
-          = _('Runner runs jobs from all unassigned projects')
-        %li
-          %span.badge.badge-success group
-          \-
-          = _('Runner runs jobs from all unassigned projects in its group')
-        %li
-          %span.badge.badge-info specific
-          \-
-          = _('Runner runs jobs from assigned projects')
-        %li
-          %span.badge.badge-warning locked
-          \-
-          = _('Runner cannot be assigned to other projects')
-        %li
-          %span.badge.badge-danger paused
-          \-
-          = _('Runner will not receive any new jobs')
-  .bs-callout.clearfix
-    .float-left
-      %p
-        = _('You can reset runners registration token by pressing a button below.')
-      .prepend-top-10
-        = button_to _('Reset runners registration token'), reset_runners_token_admin_application_settings_path,
-          method: :put, class: 'btn btn-default',
-          data: { confirm: _('Are you sure you want to reset registration token?') }
-  = render partial: 'ci/runner/how_to_setup_shared_runner',
-           locals: { registration_token: Gitlab::CurrentSettings.runners_registration_token }
-  .bs-callout
-    %p
-      = _('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
-      .filtered-search-wrapper
-        .filtered-search-box
-          = dropdown_tag(custom_icon('icon_history'),
-            options: { wrapper_class: 'filtered-search-history-dropdown-wrapper',
-            toggle_class: 'filtered-search-history-dropdown-toggle-button',
-            dropdown_class: 'filtered-search-history-dropdown',
-            content_class: 'filtered-search-history-dropdown-content',
-            title: _('Recent searches') }) do
-            .js-filtered-search-history-dropdown{ data: { full_path: admin_runners_path } }
-          .filtered-search-box-input-container.droplab-dropdown
-            .scroll-container
-              %ul.tokens-container.list-unstyled
-                %li.input-token
-                  %input.form-control.filtered-search{ { id: 'filtered-search-runners', placeholder: _('Search or filter results...') } }
-            #js-dropdown-hint.filtered-search-input-dropdown-menu.dropdown-menu.hint-dropdown
-              %ul{ data: { dropdown: true } }
-                %li.filter-dropdown-item{ data: { action: 'submit' } }
-                  = button_tag class: %w[btn btn-link] do
-                    = sprite_icon('search')
-                    %span
-                      = _('Press Enter or click to search')
-              %ul.filter-dropdown{ data: { dynamic: true, dropdown: true } }
-                %li.filter-dropdown-item
-                  = button_tag class: %w[btn btn-link] do
-                    -# Encapsulate static class name `{{icon}}` inside #{} to bypass
-                    -# haml lint's ClassAttributeWithStaticValue
-                    %svg
-                      %use{ 'xlink:href': "#{'{{icon}}'}" }
-                    %span.js-filter-hint
-                      {{hint}}
-                    %span.js-filter-tag.dropdown-light-content
-                      {{tag}}
-            #js-dropdown-admin-runner-status.filtered-search-input-dropdown-menu.dropdown-menu
-              %ul{ data: { dropdown: true } }
-                - Ci::Runner::AVAILABLE_STATUSES.each do |status|
-                  %li.filter-dropdown-item{ data: { value: status } }
-                    = button_tag class: %w[btn btn-link] do
-                      = status.titleize
-            #js-dropdown-admin-runner-type.filtered-search-input-dropdown-menu.dropdown-menu
-              %ul{ data: { dropdown: true } }
-                - Ci::Runner::AVAILABLE_TYPES.each do |runner_type|
-                  %li.filter-dropdown-item{ data: { value: runner_type } }
-                    = button_tag class: %w[btn btn-link] do
-                      = runner_type.titleize
-
-          = button_tag class: %w[clear-search hidden] do
-            = icon('times')
-        .filter-dropdown-container
-          = render 'sort_dropdown'
+  .row
+    .col-sm-6
+      .bs-callout
+        %p
+          = (_"A 'Runner' is a process which runs a job. You can set up as many Runners as you need.")
+          %br
+          = _('Runners can be placed on separate users, servers, even on your local machine.')
+          %br
+        %div
+          %span= _('Each Runner can be in one of the following states:')
+          %ul
+            %li
+              %span.badge.badge-success shared
+              \-
+              = _('Runner runs jobs from all unassigned projects')
+            %li
+              %span.badge.badge-success group
+              \-
+              = _('Runner runs jobs from all unassigned projects in its group')
+            %li
+              %span.badge.badge-info specific
+              \-
+              = _('Runner runs jobs from assigned projects')
+            %li
+              %span.badge.badge-warning locked
+              \-
+              = _('Runner cannot be assigned to other projects')
+            %li
+              %span.badge.badge-danger paused
+              \-
+              = _('Runner will not receive any new jobs')
+    .col-sm-6
+      .bs-callout
+        = render partial: 'ci/runner/how_to_setup_runner',
+                 locals: { registration_token: Gitlab::CurrentSettings.runners_registration_token,
+                           type: 'shared',
+                           reset_token_url: reset_registration_token_admin_application_settings_path }
+  .row
+    .col-sm-9
+      = form_tag admin_runners_path, id: 'runners-search', method: :get, class: 'filter-form js-filter-form' do
+        .filtered-search-wrapper
+          .filtered-search-box
+            = dropdown_tag(custom_icon('icon_history'),
+              options: { wrapper_class: 'filtered-search-history-dropdown-wrapper',
+              toggle_class: 'filtered-search-history-dropdown-toggle-button',
+              dropdown_class: 'filtered-search-history-dropdown',
+              content_class: 'filtered-search-history-dropdown-content',
+              title: _('Recent searches') }) do
+              .js-filtered-search-history-dropdown{ data: { full_path: admin_runners_path } }
+            .filtered-search-box-input-container.droplab-dropdown
+              .scroll-container
+                %ul.tokens-container.list-unstyled
+                  %li.input-token
+                    %input.form-control.filtered-search{ { id: 'filtered-search-runners', placeholder: _('Search or filter results...') } }
+              #js-dropdown-hint.filtered-search-input-dropdown-menu.dropdown-menu.hint-dropdown
+                %ul{ data: { dropdown: true } }
+                  %li.filter-dropdown-item{ data: { action: 'submit' } }
+                    = button_tag class: %w[btn btn-link] do
+                      = sprite_icon('search')
+                      %span
+                        = _('Press Enter or click to search')
+                %ul.filter-dropdown{ data: { dynamic: true, dropdown: true } }
+                  %li.filter-dropdown-item
+                    = button_tag class: %w[btn btn-link] do
+                      -# Encapsulate static class name `{{icon}}` inside #{} to bypass
+                      -# haml lint's ClassAttributeWithStaticValue
+                      %svg
+                        %use{ 'xlink:href': "#{'{{icon}}'}" }
+                      %span.js-filter-hint
+                        {{hint}}
+                      %span.js-filter-tag.dropdown-light-content
+                        {{tag}}
+              #js-dropdown-admin-runner-status.filtered-search-input-dropdown-menu.dropdown-menu
+                %ul{ data: { dropdown: true } }
+                  - Ci::Runner::AVAILABLE_STATUSES.each do |status|
+                    %li.filter-dropdown-item{ data: { value: status } }
+                      = button_tag class: %w[btn btn-link] do
+                        = status.titleize
+              #js-dropdown-admin-runner-type.filtered-search-input-dropdown-menu.dropdown-menu
+                %ul{ data: { dropdown: true } }
+                  - Ci::Runner::AVAILABLE_TYPES.each do |runner_type|
+                    %li.filter-dropdown-item{ data: { value: runner_type } }
+                      = button_tag class: %w[btn btn-link] do
+                        = runner_type.titleize
+            = button_tag class: %w[clear-search hidden] do
+              = icon('times')
+          .filter-dropdown-container
+            = render 'sort_dropdown'
+    .col-sm-3.text-right-lg
+      = _('Runners currently online: %{active_runners_count}') % { active_runners_count: @active_runners_count }
   - if @runners.any?
     .runners-content.content-list

app/views/ci/runner/_how_to_setup_runner.html.haml

@@ -13,5 +13,9 @@
     = _("Use the following registration token during setup:")
     %code#registration_token= registration_token
     = clipboard_button(target: '#registration_token', title: _("Copy token to clipboard"), class: "btn-transparent btn-clipboard")
+    .prepend-top-10.append-bottom-10
+      = button_to _("Reset runners registration token"), reset_token_url,
+      method: :put, class: 'btn btn-default',
+      data: { confirm: _("Are you sure you want to reset registration token?") }
   %li
     = _("Start the Runner!")

app/views/ci/runner/_how_to_setup_shared_runner.html.haml

-.bs-callout.help-callout
-  = render partial: 'ci/runner/how_to_setup_runner',
-           locals: { registration_token: registration_token, type: 'shared' }

app/views/ci/runner/_how_to_setup_specific_runner.html.haml

-.bs-callout.help-callout
-  .append-bottom-10
-    %h4= _('Set up a specific Runner automatically')
-
-  %p
-    - link_to_help_page = link_to(_('Learn more about Kubernetes'),
-                                  help_page_path('user/project/clusters/index'),
-                                  target: '_blank',
-                                  rel: 'noopener noreferrer')
-
-    = _('You can easily install a Runner on a Kubernetes cluster. %{link_to_help_page}').html_safe % { link_to_help_page: link_to_help_page }
-
-  %ol
-    %li
-      = _('Click the button below to begin the install process by navigating to the Kubernetes page')
-    %li
-      = _('Select an existing Kubernetes cluster or create a new one')
-    %li
-      = _('From the Kubernetes cluster details view, install Runner from the applications list')
-
-  = link_to _('Install Runner on Kubernetes'),
-    project_clusters_path(@project),
-    class: 'btn btn-info'
-  %hr
-  = render partial: 'ci/runner/how_to_setup_runner',
-           locals: { registration_token: registration_token, type: 'specific' }

app/views/groups/runners/_group_runners.html.haml

@@ -11,7 +11,9 @@
 -# https://gitlab.com/gitlab-org/gitlab-ce/issues/45894
 - if can?(current_user, :admin_pipeline, @group)
   = render partial: 'ci/runner/how_to_setup_runner',
-           locals: { registration_token: @group.runners_token, type: 'group' }
+           locals: { registration_token: @group.runners_token,
+                     type: 'group',
+                     reset_token_url: reset_registration_token_group_settings_ci_cd_path }
 - if @group.runners.empty?
   %h4.underlined-title

app/views/projects/runners/_specific_runners.html.haml

 %h3
   = _('Specific Runners')
-= render partial: 'ci/runner/how_to_setup_specific_runner',
-         locals: { registration_token: @project.runners_token }
+.bs-callout.help-callout
+  .append-bottom-10
+    %h4= _('Set up a specific Runner automatically')
+
+  %p
+    - link_to_help_page = link_to(_('Learn more about Kubernetes'),
+                                  help_page_path('user/project/clusters/index'),
+                                  target: '_blank',
+                                  rel: 'noopener noreferrer')
+
+    = _('You can easily install a Runner on a Kubernetes cluster. %{link_to_help_page}').html_safe % { link_to_help_page: link_to_help_page }
+
+  %ol
+    %li
+      = _('Click the button below to begin the install process by navigating to the Kubernetes page')
+    %li
+      = _('Select an existing Kubernetes cluster or create a new one')
+    %li
+      = _('From the Kubernetes cluster details view, install Runner from the applications list')
+
+  = link_to _('Install Runner on Kubernetes'),
+    project_clusters_path(@project),
+    class: 'btn btn-info'
+  %hr
+  = render partial: 'ci/runner/how_to_setup_runner',
+           locals: { registration_token: @project.runners_token,
+                     type: 'specific',
+                     reset_token_url: reset_registration_token_namespace_project_settings_ci_cd_path }
 - if @project_runners.any?
   %h4.underlined-title Runners activated for this project

app/views/projects/settings/ci_cd/_form.html.haml

@@ -3,16 +3,6 @@
     = form_for @project, url: project_settings_ci_cd_path(@project, anchor: 'js-general-pipeline-settings') do |f|
       = form_errors(@project)
       %fieldset.builds-feature
-        .form-group.append-bottom-default.js-secret-runner-token
-          = f.label :runners_token, _("Runner token"), class: 'label-bold'
-          .form-control.js-secret-value-placeholder
-            = '*' * 20
-          = f.text_field :runners_token, class: "form-control hide js-secret-value", placeholder: 'xEeFCaDAB89'
-          %p.form-text.text-muted= _("The secure token used by the Runner to checkout the project")
-          %button.btn.btn-info.prepend-top-10.js-secret-value-reveal-button{ type: 'button', data: { secret_reveal_status: 'false' } }
-            = _('Reveal value')
-
-        %hr
         .form-group
           %h5.prepend-top-0
             = _("Git strategy for pipelines")

app/views/projects/settings/ci_cd/show.html.haml

@@ -12,7 +12,7 @@
     %button.btn.js-settings-toggle{ type: 'button' }
       = expanded ? _('Collapse') : _('Expand')
     %p
-      = _("Access your runner token, customize your pipeline configuration, and view your pipeline status and coverage report.")
+      = _("Customize your pipeline configuration, view your pipeline status and coverage report.")
   .settings-content
     = render 'form'

config/routes/admin.rb

@@ -107,7 +107,7 @@ namespace :admin do
   resource :application_settings, only: [:show, :update] do
     resources :services, only: [:index, :edit, :update]
     get :usage_data
-    put :reset_runners_token
+    put :reset_registration_token
     put :reset_health_check_token
     put :clear_repository_check_states
     get :integrations, :repository, :templates, :ci_cd, :reporting, :metrics_and_profiling, :network, :geo, :preferences

config/routes/group.rb

@@ -27,7 +27,9 @@ constraints(::Constraints::GroupUrlConstrainer.new) do
         as: :group,
         constraints: { group_id: Gitlab::PathRegex.full_namespace_route_regex }) do
     namespace :settings do
-      resource :ci_cd, only: [:show], controller: 'ci_cd'
+      resource :ci_cd, only: [:show], controller: 'ci_cd' do
+        put :reset_registration_token
+      end
     end
     resource :variables, only: [:show, :update]

config/routes/project.rb

@@ -437,6 +437,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
         get :members, to: redirect("%{namespace_id}/%{project_id}/project_members")
         resource :ci_cd, only: [:show, :update], controller: 'ci_cd' do
           post :reset_cache
+          put :reset_registration_token
         end
         resource :integrations, only: [:show]
         resource :repository, only: [:show], controller: :repository do

locale/ar_SA/gitlab.po

@@ -480,7 +480,7 @@ msgstr ""
 msgid "Access to failing storages has been temporarily disabled to allow the mount to recover. Reset storage information after the issue has been resolved to allow access again."
 msgstr ""
-msgid "Access your runner token, customize your pipeline configuration, and view your pipeline status and coverage report."
+msgid "Customize your pipeline configuration, view your pipeline status and coverage report."
 msgstr ""
 msgid "Account"

locale/bg/gitlab.po

@@ -360,7 +360,7 @@ msgstr ""
 msgid "Access to failing storages has been temporarily disabled to allow the mount to recover. Reset storage information after the issue has been resolved to allow access again."
 msgstr ""
-msgid "Access your runner token, customize your pipeline configuration, and view your pipeline status and coverage report."
+msgid "Customize your pipeline configuration, view your pipeline status and coverage report."
 msgstr ""
 msgid "Account"

locale/ca_ES/gitlab.po

@@ -360,7 +360,7 @@ msgstr ""
 msgid "Access to failing storages has been temporarily disabled to allow the mount to recover. Reset storage information after the issue has been resolved to allow access again."
 msgstr ""
-msgid "Access your runner token, customize your pipeline configuration, and view your pipeline status and coverage report."
+msgid "Customize your pipeline configuration, view your pipeline status and coverage report."
 msgstr ""
 msgid "Account"

locale/cs_CZ/gitlab.po

@@ -420,7 +420,7 @@ msgstr ""
 msgid "Access to failing storages has been temporarily disabled to allow the mount to recover. Reset storage information after the issue has been resolved to allow access again."
 msgstr ""
-msgid "Access your runner token, customize your pipeline configuration, and view your pipeline status and coverage report."
+msgid "Customize your pipeline configuration, view your pipeline status and coverage report."
 msgstr ""
 msgid "Account"

locale/da_DK/gitlab.po

@@ -360,7 +360,7 @@ msgstr ""
 msgid "Access to failing storages has been temporarily disabled to allow the mount to recover. Reset storage information after the issue has been resolved to allow access again."
 msgstr ""
-msgid "Access your runner token, customize your pipeline configuration, and view your pipeline status and coverage report."
+msgid "Customize your pipeline configuration, view your pipeline status and coverage report."
 msgstr ""
 msgid "Account"

locale/de/gitlab.po

@@ -360,7 +360,7 @@ msgstr ""
 msgid "Access to failing storages has been temporarily disabled to allow the mount to recover. Reset storage information after the issue has been resolved to allow access again."
 msgstr "Zugriff auf fehlerhafte Speicher wurde vorübergehend deaktiviert, um die Wiederherstellung zu ermöglichen. Für den zukünftigen Zugriff, behebe bitte das Problem und setze danach die Speicherinformationen zurück."
-msgid "Access your runner token, customize your pipeline configuration, and view your pipeline status and coverage report."
+msgid "Customize your pipeline configuration, view your pipeline status and coverage report."
 msgstr ""
 msgid "Account"