diff --git a/Gemfile.lock b/Gemfile.lock index 896464c7f..422c22795 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -456,16 +456,16 @@ GEM rspec-support (~> 3.9.0) rspec-support (3.9.3) rszr (0.5.2) - rubocop (1.15.0) + rubocop (1.16.0) parallel (~> 1.10) parser (>= 3.0.0.0) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml - rubocop-ast (>= 1.5.0, < 2.0) + rubocop-ast (>= 1.7.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.6.0) + rubocop-ast (1.7.0) parser (>= 3.0.1.1) rubocop-performance (1.11.3) rubocop (>= 1.7.0, < 2.0) diff --git a/app/models/channel/email_parser.rb b/app/models/channel/email_parser.rb index ee44907ab..3fedf6ac7 100644 --- a/app/models/channel/email_parser.rb +++ b/app/models/channel/email_parser.rb @@ -274,7 +274,7 @@ returns content_type: mail[:content_type], body: mail[:body], from: mail[:from], - reply_to: mail[:"reply-to"], + reply_to: mail[:'reply-to'], to: mail[:to], cc: mail[:cc], subject: mail[:subject], diff --git a/lib/gitlab/http_client.rb b/lib/gitlab/http_client.rb index 310144fbb..98e7baf7e 100644 --- a/lib/gitlab/http_client.rb +++ b/lib/gitlab/http_client.rb @@ -39,7 +39,7 @@ class GitLab def headers { - "PRIVATE-TOKEN": @api_token + 'PRIVATE-TOKEN': @api_token } end end diff --git a/spec/system/manage/organizations_spec.rb b/spec/system/manage/organizations_spec.rb index e5afd0115..2c248d531 100644 --- a/spec/system/manage/organizations_spec.rb +++ b/spec/system/manage/organizations_spec.rb @@ -14,7 +14,7 @@ RSpec.describe 'Manage > Organizations', type: :system do it 'creates record', db_strategy: :reset do # required to edit attribute in admin interface - screens = { edit: { "admin.organization": { shown: true, required: false } } } + screens = { edit: { 'admin.organization': { shown: true, required: false } } } attribute = create(:object_manager_attribute_text, object_name: 'Organization',