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
02994fbe
Commit
02994fbe
authored
Dec 15, 2017
by
Lin Jen-Shin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Backport changes from EE
parent
59ac184f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
.rubocop.yml
.rubocop.yml
+2
-2
app/controllers/concerns/issuable_actions.rb
app/controllers/concerns/issuable_actions.rb
+1
-1
lib/extracts_path.rb
lib/extracts_path.rb
+1
-1
No files found.
.rubocop.yml
View file @
02994fbe
...
...
@@ -1191,9 +1191,9 @@ Gitlab/ModuleWithInstanceVariables:
Enable
:
true
Exclude
:
# We ignore Rails helpers right now because it's hard to workaround it
-
app/helpers/*_helper.rb
-
app/helpers/*
*/*
_helper.rb
# We ignore Rails mailers right now because it's hard to workaround it
-
app/mailers/emails/*.rb
-
app/mailers/emails/*
*/*
.rb
# We ignore spec helpers because it usually doesn't matter
-
spec/support/**/*.rb
-
features/steps/**/*.rb
...
...
app/controllers/concerns/issuable_actions.rb
View file @
02994fbe
...
...
@@ -81,7 +81,7 @@ module IssuableActions
private
def
recaptcha_check_if_spammable
(
should_redirect
=
true
,
&
block
)
return
yield
unless
@
issuable
.
is_a?
Spammable
return
yield
unless
issuable
.
is_a?
Spammable
recaptcha_check_with_fallback
(
should_redirect
,
&
block
)
end
...
...
lib/extracts_path.rb
View file @
02994fbe
...
...
@@ -139,7 +139,7 @@ module ExtractsPath
def
lfs_blob_ids
blob_ids
=
tree
.
blobs
.
map
(
&
:id
)
@lfs_blob_ids
=
Gitlab
::
Git
::
Blob
.
batch_lfs_pointers
(
@project
.
repository
,
blob_ids
).
map
(
&
:id
)
@lfs_blob_ids
=
Gitlab
::
Git
::
Blob
.
batch_lfs_pointers
(
@project
.
repository
,
blob_ids
).
map
(
&
:id
)
# rubocop:disable Gitlab/ModuleWithInstanceVariables
end
private
...
...
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