diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-01-10 15:47:07 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-01-10 15:47:07 +0000 |
| commit | 6ff989cd6d8bb35f237bd2fb398c8b2276189f29 (patch) | |
| tree | accd04bc9b862530ee8c5683bc6c0eefc0ff1540 | |
| parent | c5b88a4435efe071e46367b5ecf918e78b517921 (diff) | |
| parent | 292ae1246c9844d3e7dea3b0386106c07df5a149 (diff) | |
| download | gitlab-ce-6ff989cd6d8bb35f237bd2fb398c8b2276189f29.tar.gz | |
Merge branch 'fix/rubocop-offenses-on-master' into 'master'
Fix Rubocop offenses on `master`
See merge request !8516
| -rw-r--r-- | Gemfile.lock | 2 | ||||
| -rw-r--r-- | lib/gitlab/ldap/access.rb | 4 | ||||
| -rw-r--r-- | spec/lib/gitlab/ldap/access_spec.rb | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index cb71a468aa1..786a44fe0fa 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 7ed01bf56ca..54a5b1d31cd 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 011c33e63a1..b9d12c3c24c 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 |