diff --git a/Gemfile.lock b/Gemfile.lock index cb71a468aa17623937df4b61a003620f0869b664..786a44fe0fa5bcd1b72bd8dbb830668964e5a2d0 100644 --- a/Gemfile.lock +++ b/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) diff --git a/lib/gitlab/ldap/access.rb b/lib/gitlab/ldap/access.rb index 7ed01bf56cab32843d15f0f8ddd7fa45eaba9eaf..54a5b1d31cd4d80c8e898619715c1e45634066bb 100644 --- a/lib/gitlab/ldap/access.rb +++ b/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 diff --git a/spec/lib/gitlab/ldap/access_spec.rb b/spec/lib/gitlab/ldap/access_spec.rb index 011c33e63a1471da38248df146c997df7075392b..b9d12c3c24c18dfc5ce1239d359842e810c122be 100644 --- a/spec/lib/gitlab/ldap/access_spec.rb +++ b/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