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
0
Merge Requests
0
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
Léo-Paul Géneau
gitlab-ce
Commits
215228b4
Commit
215228b4
authored
Feb 21, 2017
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Enable Performance/RedundantBlockCall
parent
8924594a
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
6 additions
and
11 deletions
+6
-11
.rubocop.yml
.rubocop.yml
+3
-0
.rubocop_todo.yml
.rubocop_todo.yml
+0
-8
app/controllers/application_controller.rb
app/controllers/application_controller.rb
+1
-1
lib/gitlab/optimistic_locking.rb
lib/gitlab/optimistic_locking.rb
+1
-1
lib/gitlab/shell.rb
lib/gitlab/shell.rb
+1
-1
No files found.
.rubocop.yml
View file @
215228b4
...
@@ -923,6 +923,9 @@ Lint/UnneededSplatExpansion:
...
@@ -923,6 +923,9 @@ Lint/UnneededSplatExpansion:
Lint/UnusedBlockArgument
:
Lint/UnusedBlockArgument
:
Enabled
:
false
Enabled
:
false
Performance/RedundantBlockCall
:
Enabled
:
true
Rails/HttpPositionalArguments
:
Rails/HttpPositionalArguments
:
Enabled
:
false
Enabled
:
false
...
...
.rubocop_todo.yml
View file @
215228b4
...
@@ -6,14 +6,6 @@
...
@@ -6,14 +6,6 @@
# Note that changes in the inspected code, or installation of new
# Note that changes in the inspected code, or installation of new
# versions of RuboCop, may require this file to be generated again.
# versions of RuboCop, may require this file to be generated again.
# Offense count: 3
# Cop supports --auto-correct.
Performance/RedundantBlockCall
:
Exclude
:
-
'
app/controllers/application_controller.rb'
-
'
lib/gitlab/optimistic_locking.rb'
-
'
lib/gitlab/shell.rb'
# Offense count: 5
# Offense count: 5
# Cop supports --auto-correct.
# Cop supports --auto-correct.
Performance/RedundantMatch
:
Performance/RedundantMatch
:
...
...
app/controllers/application_controller.rb
View file @
215228b4
...
@@ -181,7 +181,7 @@ class ApplicationController < ActionController::Base
...
@@ -181,7 +181,7 @@ class ApplicationController < ActionController::Base
end
end
def
gitlab_ldap_access
(
&
block
)
def
gitlab_ldap_access
(
&
block
)
Gitlab
::
LDAP
::
Access
.
open
{
|
access
|
block
.
call
(
access
)
}
Gitlab
::
LDAP
::
Access
.
open
{
|
access
|
yield
(
access
)
}
end
end
# JSON for infinite scroll via Pager object
# JSON for infinite scroll via Pager object
...
...
lib/gitlab/optimistic_locking.rb
View file @
215228b4
...
@@ -6,7 +6,7 @@ module Gitlab
...
@@ -6,7 +6,7 @@ module Gitlab
loop
do
loop
do
begin
begin
ActiveRecord
::
Base
.
transaction
do
ActiveRecord
::
Base
.
transaction
do
return
block
.
call
(
subject
)
return
yield
(
subject
)
end
end
rescue
ActiveRecord
::
StaleObjectError
rescue
ActiveRecord
::
StaleObjectError
retries
-=
1
retries
-=
1
...
...
lib/gitlab/shell.rb
View file @
215228b4
...
@@ -145,7 +145,7 @@ module Gitlab
...
@@ -145,7 +145,7 @@ module Gitlab
# batch_add_keys { |adder| adder.add_key("key-42", "sha-rsa ...") }
# batch_add_keys { |adder| adder.add_key("key-42", "sha-rsa ...") }
def
batch_add_keys
(
&
block
)
def
batch_add_keys
(
&
block
)
IO
.
popen
(
%W(
#{
gitlab_shell_path
}
/bin/gitlab-keys batch-add-keys)
,
'w'
)
do
|
io
|
IO
.
popen
(
%W(
#{
gitlab_shell_path
}
/bin/gitlab-keys batch-add-keys)
,
'w'
)
do
|
io
|
block
.
call
(
KeyAdder
.
new
(
io
))
yield
(
KeyAdder
.
new
(
io
))
end
end
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