Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
6ff989cd
Commit
6ff989cd
authored
Jan 10, 2017
by
Sean McGivern
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix/rubocop-offenses-on-master' into 'master'
Fix Rubocop offenses on `master` See merge request !8516
parents
c5b88a44
292ae124
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
Gemfile.lock
Gemfile.lock
+1
-1
lib/gitlab/ldap/access.rb
lib/gitlab/ldap/access.rb
+2
-2
spec/lib/gitlab/ldap/access_spec.rb
spec/lib/gitlab/ldap/access_spec.rb
+2
-2
No files found.
Gemfile.lock
View file @
6ff989cd
...
@@ -974,7 +974,7 @@ DEPENDENCIES
...
@@ -974,7 +974,7 @@ DEPENDENCIES
rqrcode-rails3 (~> 0.1.7)
rqrcode-rails3 (~> 0.1.7)
rspec-rails (~> 3.5.0)
rspec-rails (~> 3.5.0)
rspec-retry (~> 0.4.5)
rspec-retry (~> 0.4.5)
rubocop (~> 0.4
3
.0)
rubocop (~> 0.4
6
.0)
rubocop-rspec (~> 1.9.1)
rubocop-rspec (~> 1.9.1)
ruby-fogbugz (~> 0.2.1)
ruby-fogbugz (~> 0.2.1)
ruby-prof (~> 0.16.2)
ruby-prof (~> 0.16.2)
...
...
lib/gitlab/ldap/access.rb
View file @
6ff989cd
...
@@ -69,7 +69,7 @@ module Gitlab
...
@@ -69,7 +69,7 @@ module Gitlab
user
.
ldap_block
user
.
ldap_block
Gitlab
::
AppLogger
.
info
(
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
}
)"
"blocking Gitlab user
\"
#{
user
.
name
}
\"
(
#{
user
.
email
}
)"
)
)
end
end
...
@@ -78,7 +78,7 @@ module Gitlab
...
@@ -78,7 +78,7 @@ module Gitlab
user
.
activate
user
.
activate
Gitlab
::
AppLogger
.
info
(
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
}
)"
"unblocking Gitlab user
\"
#{
user
.
name
}
\"
(
#{
user
.
email
}
)"
)
)
end
end
...
...
spec/lib/gitlab/ldap/access_spec.rb
View file @
6ff989cd
...
@@ -127,7 +127,7 @@ describe Gitlab::LDAP::Access, lib: true do
...
@@ -127,7 +127,7 @@ describe Gitlab::LDAP::Access, lib: true do
it
'logs the reason'
do
it
'logs the reason'
do
expect
(
Gitlab
::
AppLogger
).
to
have_received
(
:info
).
with
(
expect
(
Gitlab
::
AppLogger
).
to
have_received
(
:info
).
with
(
"LDAP account
\"
123456
\"
reason, "
+
"LDAP account
\"
123456
\"
reason, "
\
"blocking Gitlab user
\"
#{
user
.
name
}
\"
(
#{
user
.
email
}
)"
"blocking Gitlab user
\"
#{
user
.
name
}
\"
(
#{
user
.
email
}
)"
)
)
end
end
...
@@ -148,7 +148,7 @@ describe Gitlab::LDAP::Access, lib: true do
...
@@ -148,7 +148,7 @@ describe Gitlab::LDAP::Access, lib: true do
it
'logs the reason'
do
it
'logs the reason'
do
Gitlab
::
AppLogger
.
info
(
Gitlab
::
AppLogger
.
info
(
"LDAP account
\"
123456
\"
reason, "
+
"LDAP account
\"
123456
\"
reason, "
\
"unblocking Gitlab user
\"
#{
user
.
name
}
\"
(
#{
user
.
email
}
)"
"unblocking Gitlab user
\"
#{
user
.
name
}
\"
(
#{
user
.
email
}
)"
)
)
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment