Merge branch 'fix/rubocop-offenses-on-master' into 'master'

Fix Rubocop offenses on `master`

See merge request !8516

Gemfile.lock

@@ -974,7 +974,7 @@ DEPENDENCIES
   rqrcode-rails3 (~> 0.1.7)
   rspec-rails (~> 3.5.0)
   rspec-retry (~> 0.4.5)
-  rubocop (~> 0.43.0)
+  rubocop (~> 0.46.0)
   rubocop-rspec (~> 1.9.1)
   ruby-fogbugz (~> 0.2.1)
   ruby-prof (~> 0.16.2)

lib/gitlab/ldap/access.rb

@@ -69,7 +69,7 @@ module Gitlab
         user.ldap_block
 
         Gitlab::AppLogger.info(
-          "LDAP account \"#{user.ldap_identity.extern_uid}\" #{reason}, " +
+          "LDAP account \"#{user.ldap_identity.extern_uid}\" #{reason}, " \
           "blocking Gitlab user \"#{user.name}\" (#{user.email})"
         )
       end
@@ -78,7 +78,7 @@ module Gitlab
         user.activate
 
         Gitlab::AppLogger.info(
-          "LDAP account \"#{user.ldap_identity.extern_uid}\" #{reason}, " +
+          "LDAP account \"#{user.ldap_identity.extern_uid}\" #{reason}, " \
           "unblocking Gitlab user \"#{user.name}\" (#{user.email})"
         )
       end

spec/lib/gitlab/ldap/access_spec.rb

@@ -127,7 +127,7 @@ describe Gitlab::LDAP::Access, lib: true do
 
     it 'logs the reason' do
       expect(Gitlab::AppLogger).to have_received(:info).with(
-        "LDAP account \"123456\" reason, " +
+        "LDAP account \"123456\" reason, " \
         "blocking Gitlab user \"#{user.name}\" (#{user.email})"
       )
     end
@@ -148,7 +148,7 @@ describe Gitlab::LDAP::Access, lib: true do
 
     it 'logs the reason' do
       Gitlab::AppLogger.info(
-        "LDAP account \"123456\" reason, " +
+        "LDAP account \"123456\" reason, " \
         "unblocking Gitlab user \"#{user.name}\" (#{user.email})"
       )
     end