From cff423449f0015d92fa8a06f034eaa2b0ad9af9f Mon Sep 17 00:00:00 2001 From: Grzegorz Bizon Date: Tue, 10 Jan 2017 14:31:21 +0100 Subject: Fix Rubocop offenses in LDAP related code and spec --- lib/gitlab/ldap/access.rb | 4 ++-- spec/lib/gitlab/ldap/access_spec.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) 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 -- cgit v1.2.1 From 292ae1246c9844d3e7dea3b0386106c07df5a149 Mon Sep 17 00:00:00 2001 From: Grzegorz Bizon Date: Tue, 10 Jan 2017 14:31:54 +0100 Subject: Update Gemfile.lock to reflect Rubocop gem version --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) -- cgit v1.2.1