summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2017-01-10 14:31:21 +0100
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2017-01-10 14:31:21 +0100
commitcff423449f0015d92fa8a06f034eaa2b0ad9af9f (patch)
tree33f96815c75b7e0d153f843a91acca1345235749
parent8c9ccc3d6e52212970ba700cfa4e98b1875aaede (diff)
downloadgitlab-ce-cff423449f0015d92fa8a06f034eaa2b0ad9af9f.tar.gz
Fix Rubocop offenses in LDAP related code and spec
-rw-r--r--lib/gitlab/ldap/access.rb4
-rw-r--r--spec/lib/gitlab/ldap/access_spec.rb4
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