Add latest changes from gitlab-org/gitlab@master

app/assets/javascripts/right_sidebar.js

@@ -1,4 +1,4 @@
-/* eslint-disable func-names, no-var, consistent-return, one-var, no-else-return, no-param-reassign */
+/* eslint-disable func-names, consistent-return, no-else-return, no-param-reassign */
 
 import $ from 'jquery';
 import _ from 'underscore';
@@ -44,12 +44,11 @@ Sidebar.prototype.addEventListeners = function() {
 };
 
 Sidebar.prototype.sidebarToggleClicked = function(e, triggered) {
-  var $allGutterToggleIcons, $this, isExpanded, tooltipLabel;
+  const $this = $(this);
+  const isExpanded = $this.find('i').hasClass('fa-angle-double-right');
+  const tooltipLabel = isExpanded ? __('Expand sidebar') : __('Collapse sidebar');
+  const $allGutterToggleIcons = $('.js-sidebar-toggle i');
   e.preventDefault();
-  $this = $(this);
-  isExpanded = $this.find('i').hasClass('fa-angle-double-right');
-  tooltipLabel = isExpanded ? __('Expand sidebar') : __('Collapse sidebar');
-  $allGutterToggleIcons = $('.js-sidebar-toggle i');
 
   if (isExpanded) {
     $allGutterToggleIcons.removeClass('fa-angle-double-right').addClass('fa-angle-double-left');
@@ -77,15 +76,9 @@ Sidebar.prototype.sidebarToggleClicked = function(e, triggered) {
 };
 
 Sidebar.prototype.toggleTodo = function(e) {
-  var $this, ajaxType, url;
+  const $this = $(e.currentTarget);
-  $this = $(e.currentTarget);
+  const ajaxType = $this.data('deletePath') ? 'delete' : 'post';
-  ajaxType = $this.data('deletePath') ? 'delete' : 'post';
+  const url = String($this.data('deletePath') || $this.data('createPath'));
-
-  if ($this.data('deletePath')) {
-    url = String($this.data('deletePath'));
-  } else {
-    url = String($this.data('createPath'));
-  }
 
   $this.tooltip('hide');
 
@@ -141,13 +134,12 @@ Sidebar.prototype.todoUpdateDone = function(data) {
 };
 
 Sidebar.prototype.sidebarDropdownLoading = function() {
-  var $loading, $sidebarCollapsedIcon, i, img;
+  const $sidebarCollapsedIcon = $(this)
-  $sidebarCollapsedIcon = $(this)
     .closest('.block')
     .find('.sidebar-collapsed-icon');
-  img = $sidebarCollapsedIcon.find('img');
+  const img = $sidebarCollapsedIcon.find('img');
-  i = $sidebarCollapsedIcon.find('i');
+  const i = $sidebarCollapsedIcon.find('i');
-  $loading = $('<i class="fa fa-spinner fa-spin"></i>');
+  const $loading = $('<i class="fa fa-spinner fa-spin"></i>');
   if (img.length) {
     img.before($loading);
     return img.hide();
@@ -158,13 +150,12 @@ Sidebar.prototype.sidebarDropdownLoading = function() {
 };
 
 Sidebar.prototype.sidebarDropdownLoaded = function() {
-  var $sidebarCollapsedIcon, i, img;
+  const $sidebarCollapsedIcon = $(this)
-  $sidebarCollapsedIcon = $(this)
     .closest('.block')
     .find('.sidebar-collapsed-icon');
-  img = $sidebarCollapsedIcon.find('img');
+  const img = $sidebarCollapsedIcon.find('img');
   $sidebarCollapsedIcon.find('i.fa-spin').remove();
-  i = $sidebarCollapsedIcon.find('i');
+  const i = $sidebarCollapsedIcon.find('i');
   if (img.length) {
     return img.show();
   } else {
@@ -173,19 +164,17 @@ Sidebar.prototype.sidebarDropdownLoaded = function() {
 };
 
 Sidebar.prototype.sidebarCollapseClicked = function(e) {
-  var $block, sidebar;
   if ($(e.currentTarget).hasClass('dont-change-state')) {
     return;
   }
-  sidebar = e.data;
+  const sidebar = e.data;
   e.preventDefault();
-  $block = $(this).closest('.block');
+  const $block = $(this).closest('.block');
   return sidebar.openDropdown($block);
 };
 
 Sidebar.prototype.openDropdown = function(blockOrName) {
-  var $block;
+  const $block = _.isString(blockOrName) ? this.getBlock(blockOrName) : blockOrName;
-  $block = _.isString(blockOrName) ? this.getBlock(blockOrName) : blockOrName;
   if (!this.isOpen()) {
     this.setCollapseAfterUpdate($block);
     this.toggleSidebar('open');
@@ -204,10 +193,9 @@ Sidebar.prototype.setCollapseAfterUpdate = function($block) {
 };
 
 Sidebar.prototype.onSidebarDropdownHidden = function(e) {
-  var $block, sidebar;
+  const sidebar = e.data;
-  sidebar = e.data;
   e.preventDefault();
-  $block = $(e.target).closest('.block');
+  const $block = $(e.target).closest('.block');
   return sidebar.sidebarDropdownHidden($block);
 };
 

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

@@ -31,7 +31,8 @@
     %button.btn.btn-default.js-settings-toggle{ type: "button" }
       = expanded ? _('Collapse') : _('Expand')
     %p
-      = _('Register and see your runners for this group.')
+      = _("Runners are processes that pick up and execute jobs for GitLab. Here you can register and see your Runners for this project.")
+      = link_to s_('More information'), help_page_path('ci/runners/README')
   .settings-content
     = render 'groups/runners/index'
 

locale/gitlab.pot

@@ -14079,9 +14079,6 @@ msgstr ""
 msgid "Register Universal Two-Factor (U2F) Device"
 msgstr ""
 
-msgid "Register and see your runners for this group."
-msgstr ""
-
 msgid "Register for GitLab"
 msgstr ""