Merge branch 'sh-update-rubocop-and-gitlab-styles-ce' into 'master'

Update Rubocop to 0.69.0 and other gems

See merge request gitlab-org/gitlab-ce!28345

3 files changed, 20 insertions, 20 deletions

diff --git a/Gemfile b/Gemfile
index d20dbe7c2fd..6b37ecbfba9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -353,9 +353,9 @@ group :development, :test do
   gem 'spring', '~> 2.0.0'
   gem 'spring-commands-rspec', '~> 1.0.4'
 
-  gem 'gitlab-styles', '~> 2.6', require: false
+  gem 'gitlab-styles', '~> 2.7', require: false
   # Pin these dependencies, otherwise a new rule could break the CI pipelines
-  gem 'rubocop', '~> 0.68.1'
+  gem 'rubocop', '~> 0.69.0'
   gem 'rubocop-performance', '~> 1.1.0'
   gem 'rubocop-rspec', '~> 1.22.1'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 482352e59d5..8238ed4763e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -87,7 +87,7 @@ GEM
       erubi (>= 1.0.0)
       rack (>= 0.9.0)
     bindata (2.4.3)
-    binding_ninja (0.2.2)
+    binding_ninja (0.2.3)
     binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
     bootsnap (1.4.1)
@@ -299,8 +299,8 @@ GEM
     gitlab-markup (1.7.0)
     gitlab-sidekiq-fetcher (0.4.0)
       sidekiq (~> 5)
-    gitlab-styles (2.6.2)
-      rubocop (~> 0.68.1)
+    gitlab-styles (2.7.0)
+      rubocop (~> 0.69.0)
       rubocop-gitlab-security (~> 0.1.0)
       rubocop-performance (~> 1.1.0)
       rubocop-rspec (~> 1.19)
@@ -593,7 +593,7 @@ GEM
     orm_adapter (0.5.0)
     os (1.0.0)
     parallel (1.17.0)
-    parser (2.5.3.0)
+    parser (2.6.3.0)
       ast (~> 2.4.0)
     parslet (1.8.2)
     peek (1.0.1)
@@ -768,8 +768,8 @@ GEM
     rspec-mocks (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.7.0)
-    rspec-parameterized (0.4.1)
-      binding_ninja (>= 0.2.1)
+    rspec-parameterized (0.4.2)
+      binding_ninja (>= 0.2.3)
       parser
       proc_to_ast
       rspec (>= 2.13, < 4)
@@ -793,13 +793,13 @@ GEM
       pg
       rails
       sqlite3
-    rubocop (0.68.1)
+    rubocop (0.69.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
-      parser (>= 2.5, != 2.5.1.1)
+      parser (>= 2.6)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.6)
+      unicode-display_width (>= 1.4.0, < 1.7)
     rubocop-gitlab-security (0.1.1)
       rubocop (>= 0.51)
     rubocop-performance (1.1.0)
@@ -939,7 +939,7 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.5)
-    unicode-display_width (1.5.0)
+    unicode-display_width (1.6.0)
     unicorn (5.4.1)
       kgio (~> 2.6)
       raindrops (~> 0.7)
@@ -947,13 +947,13 @@ GEM
       get_process_mem (~> 0)
       unicorn (>= 4, < 6)
     uniform_notifier (1.10.0)
-    unparser (0.4.2)
+    unparser (0.4.5)
       abstract_type (~> 0.0.7)
       adamantium (~> 0.2.0)
       concord (~> 0.1.5)
       diff-lcs (~> 1.3)
       equalizer (~> 0.0.9)
-      parser (>= 2.3.1.2, < 2.6)
+      parser (~> 2.6.3)
       procto (~> 0.0.2)
     validate_email (0.1.6)
       activemodel (>= 3.0)
@@ -1076,7 +1076,7 @@ DEPENDENCIES
   gitlab-labkit (~> 0.2.0)
   gitlab-markup (~> 1.7.0)
   gitlab-sidekiq-fetcher (~> 0.4.0)
-  gitlab-styles (~> 2.6)
+  gitlab-styles (~> 2.7)
   gitlab_omniauth-ldap (~> 2.1.1)
   gon (~> 6.2)
   google-api-client (~> 0.23)
@@ -1184,7 +1184,7 @@ DEPENDENCIES
   rspec-set (~> 0.1.3)
   rspec_junit_formatter
   rspec_profiling (~> 0.0.5)
-  rubocop (~> 0.68.1)
+  rubocop (~> 0.69.0)
   rubocop-performance (~> 1.1.0)
   rubocop-rspec (~> 1.22.1)
   ruby-fogbugz (~> 0.2.1)
diff --git a/app/views/clusters/platforms/kubernetes/_form.html.haml b/app/views/clusters/platforms/kubernetes/_form.html.haml
index 8caa25a7b5e..c1727cf9079 100644
--- a/app/views/clusters/platforms/kubernetes/_form.html.haml
+++ b/app/views/clusters/platforms/kubernetes/_form.html.haml
@@ -1,7 +1,7 @@
 = bootstrap_form_for cluster, url: update_cluster_url_path, html: { class: 'gl-show-field-errors' },
   as: :cluster do |field|
   - copy_name_btn = clipboard_button(text: cluster.name, title: s_('ClusterIntegration|Copy Kubernetes cluster name'),
-    class: 'input-group-text btn-default') unless !cluster.read_only_kubernetes_platform_fields?
+    class: 'input-group-text btn-default') if cluster.read_only_kubernetes_platform_fields?
   = field.text_field :name, class: 'js-select-on-focus cluster-name', required: true,
   title: s_('ClusterIntegration|Cluster name is required.'),
   readonly: cluster.read_only_kubernetes_platform_fields?,
@@ -10,7 +10,7 @@
 
   = field.fields_for :platform_kubernetes, platform do |platform_field|
     - copy_api_url = clipboard_button(text: platform.api_url, title: s_('ClusterIntegration|Copy API URL'),
-    class: 'input-group-text btn-default') unless !cluster.read_only_kubernetes_platform_fields?
+    class: 'input-group-text btn-default') if cluster.read_only_kubernetes_platform_fields?
     = platform_field.text_field :api_url, class: 'js-select-on-focus', required: true,
     title: s_('ClusterIntegration|API URL should be a valid http/https url.'),
     readonly: cluster.read_only_kubernetes_platform_fields?,
@@ -18,7 +18,7 @@
     input_group_class: 'gl-field-error-anchor', append: copy_api_url
 
     - copy_ca_cert_btn = clipboard_button(text: platform.ca_cert, title: s_('ClusterIntegration|Copy CA Certificate'),
-      class: 'input-group-text btn-default') unless !cluster.read_only_kubernetes_platform_fields?
+      class: 'input-group-text btn-default') if cluster.read_only_kubernetes_platform_fields?
     = platform_field.text_area :ca_cert, class: 'js-select-on-focus', rows: '5',
     readonly: cluster.read_only_kubernetes_platform_fields?,
     placeholder: s_('ClusterIntegration|Certificate Authority bundle (PEM format)'),
@@ -28,7 +28,7 @@
     - show_token_btn = (platform_field.button s_('ClusterIntegration|Show'),
       type: 'button', class: 'js-show-cluster-token btn btn-default')
     - copy_token_btn = clipboard_button(text: platform.token, title: s_('ClusterIntegration|Copy Service Token'),
-      class: 'input-group-text btn-default') unless !cluster.read_only_kubernetes_platform_fields?
+      class: 'input-group-text btn-default') if cluster.read_only_kubernetes_platform_fields?
 
     = platform_field.text_field :token, type: 'password', class: 'js-select-on-focus js-cluster-token',
     required: true, title: s_('ClusterIntegration|Service token is required.'),