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
de900262
Commit
de900262
authored
Sep 19, 2018
by
GitLab Bot
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-09-19
parents
640ccda5
3f51ec21
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
21 additions
and
23 deletions
+21
-23
.rubocop_todo.yml
.rubocop_todo.yml
+0
-14
app/models/deploy_key.rb
app/models/deploy_key.rb
+1
-1
app/models/network/commit.rb
app/models/network/commit.rb
+1
-1
app/models/network/graph.rb
app/models/network/graph.rb
+2
-2
app/models/project_services/asana_service.rb
app/models/project_services/asana_service.rb
+1
-1
app/services/boards/create_service.rb
app/services/boards/create_service.rb
+1
-1
danger/commit_messages/Dangerfile
danger/commit_messages/Dangerfile
+14
-2
lib/extracts_path.rb
lib/extracts_path.rb
+1
-1
No files found.
.rubocop_todo.yml
View file @
de900262
...
...
@@ -808,20 +808,6 @@ Style/UnlessElse:
Style/UnneededInterpolation
:
Enabled
:
false
# Offense count: 11
# Cop supports --auto-correct.
Style/ZeroLengthPredicate
:
Exclude
:
-
'
app/models/deploy_key.rb'
-
'
app/models/network/commit.rb'
-
'
app/models/network/graph.rb'
-
'
app/models/project_services/asana_service.rb'
-
'
app/services/boards/create_service.rb'
-
'
app/services/merge_requests/conflicts/list_service.rb'
-
'
lib/declarative_policy/dsl.rb'
-
'
lib/extracts_path.rb'
-
'
lib/gitlab/git/repository.rb'
# Offense count: 22840
# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
# URISchemes: http, https
...
...
app/models/deploy_key.rb
View file @
de900262
...
...
@@ -18,7 +18,7 @@ class DeployKey < Key
end
def
orphaned?
self
.
deploy_keys_projects
.
length
==
0
self
.
deploy_keys_projects
.
empty?
end
def
almost_orphaned?
...
...
app/models/network/commit.rb
View file @
de900262
...
...
@@ -18,7 +18,7 @@ module Network
end
def
space
if
@spaces
.
size
>
0
if
@spaces
.
present?
@spaces
.
first
else
0
...
...
app/models/network/graph.rb
View file @
de900262
...
...
@@ -81,7 +81,7 @@ module Network
skip
=
0
while
offset
==
-
1
tmp_commits
=
find_commits
(
skip
)
if
tmp_commits
.
size
>
0
if
tmp_commits
.
present?
index
=
tmp_commits
.
index
do
|
c
|
c
.
id
==
@commit
.
id
end
...
...
@@ -218,7 +218,7 @@ module Network
def
get_space_base
(
leaves
)
space_base
=
1
parents
=
leaves
.
last
.
parents
(
@map
)
if
parents
.
size
>
0
if
parents
.
present?
if
parents
.
first
.
space
>
0
space_base
=
parents
.
first
.
space
end
...
...
app/models/project_services/asana_service.rb
View file @
de900262
...
...
@@ -65,7 +65,7 @@ http://app.asana.com/-/account_api'
# check the branch restriction is poplulated and branch is not included
branch
=
Gitlab
::
Git
.
ref_name
(
data
[
:ref
])
branch_restriction
=
restrict_to_branch
.
to_s
if
branch_restriction
.
length
>
0
&&
branch_restriction
.
index
(
branch
).
nil?
if
branch_restriction
.
present?
&&
branch_restriction
.
index
(
branch
).
nil?
return
end
...
...
app/services/boards/create_service.rb
View file @
de900262
...
...
@@ -11,7 +11,7 @@ module Boards
private
def
can_create_board?
parent
.
boards
.
size
==
0
parent
.
boards
.
empty?
end
def
create_board!
...
...
danger/commit_messages/Dangerfile
View file @
de900262
...
...
@@ -38,6 +38,10 @@ def fail_commit(commit, message)
fail
(
"
#{
commit
.
sha
}
:
#{
message
}
"
)
end
def
warn_commit
(
commit
,
message
)
warn
(
"
#{
commit
.
sha
}
:
#{
message
}
"
)
end
def
lines_changed_in_commit
(
commit
)
commit
.
diff_parent
.
stats
[
:total
][
:lines
]
end
...
...
@@ -87,13 +91,21 @@ def lint_commits(commits)
failures
=
true
end
if
subject
.
length
>
50
if
subject
.
length
>
72
fail_commit
(
commit
,
'The commit subject may not be longer than
50
characters'
'The commit subject may not be longer than
72
characters'
)
failures
=
true
elsif
subject
.
length
>
50
warn_commit
(
commit
,
"This commit's subject line could be improved. "
\
'Commit subjects are ideally no longer than roughly 50 characters, '
\
'though we allow up to 72 characters in the subject. '
\
'If possible, try to reduce the length of the subject to roughly 50 characters.'
)
end
unless
subject_starts_with_capital?
(
subject
)
...
...
lib/extracts_path.rb
View file @
de900262
...
...
@@ -54,7 +54,7 @@ module ExtractsPath
valid_refs
=
ref_names
.
select
{
|
v
|
id
.
start_with?
(
"
#{
v
}
/"
)
}
if
valid_refs
.
length
==
0
if
valid_refs
.
empty?
# No exact ref match, so just try our best
pair
=
id
.
match
(
%r{([^/]+)(.*)}
).
captures
else
...
...
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