Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
ad222f96ec59
Commit
ad222f96
authored
Feb 21, 2017
by
Douwe Maan
Browse files
Enable Style/DotPosition
parent
dd2f6c46c7e2
Changes
188
Hide whitespace changes
Inline
Side-by-side
.rubocop.yml
View file @
ad222f96
...
...
@@ -136,6 +136,10 @@
Style/Documentation
:
Enabled
:
false
Style/DotPosition
:
Enabled
:
true
EnforcedStyle
:
trailing
# Align elses and elsifs correctly.
Style/ElseAlignment
:
Enabled
:
true
...
...
.rubocop_todo.yml
View file @
ad222f96
...
...
@@ -305,13 +305,6 @@
Style/ConditionalAssignment
:
Enabled
:
false
# Offense count: 1304
# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyle, SupportedStyles.
# SupportedStyles: leading, trailing
Style/DotPosition
:
Enabled
:
false
# Offense count: 21
Style/DoubleNegation
:
Exclude
:
...
...
app/controllers/admin/application_settings_controller.rb
View file @
ad222f96
...
...
@@ -5,9 +5,9 @@
end
def
update
successful
=
ApplicationSettings
::
UpdateService
.
new
(
@application_setting
,
current_user
,
application_setting_params
)
.
execute
successful
=
ApplicationSettings
::
UpdateService
.
new
(
@application_setting
,
current_user
,
application_setting_params
)
.
execute
if
successful
redirect_to
admin_application_settings_path
,
...
...
app/controllers/concerns/issues_action.rb
View file @
ad222f96
...
...
@@ -5,9 +5,9 @@
def
issues
@label
=
issues_finder
.
labels
.
first
@issues
=
issues_collection
.
non_archived
.
page
(
params
[
:page
])
@issues
=
issues_collection
.
non_archived
.
page
(
params
[
:page
])
@collection_type
=
"Issue"
@issuable_meta_data
=
issuable_meta_data
(
@issues
,
@collection_type
)
...
...
app/controllers/concerns/merge_requests_action.rb
View file @
ad222f96
...
...
@@ -5,8 +5,8 @@
def
merge_requests
@label
=
merge_requests_finder
.
labels
.
first
@merge_requests
=
merge_requests_collection
.
page
(
params
[
:page
])
@merge_requests
=
merge_requests_collection
.
page
(
params
[
:page
])
@collection_type
=
"MergeRequest"
@issuable_meta_data
=
issuable_meta_data
(
@merge_requests
,
@collection_type
)
...
...
app/controllers/import/bitbucket_controller.rb
View file @
ad222f96
...
...
@@ -29,9 +29,9 @@
end
def
jobs
render
json:
current_user
.
created_projects
.
where
(
import_type:
'bitbucket'
)
.
to_json
(
only:
[
:id
,
:import_status
])
render
json:
current_user
.
created_projects
.
where
(
import_type:
'bitbucket'
)
.
to_json
(
only:
[
:id
,
:import_status
])
end
def
create
...
...
app/controllers/projects/badges_controller.rb
View file @
ad222f96
...
...
@@ -4,10 +4,10 @@
before_action
:no_cache_headers
,
except:
[
:index
]
def
build
build_status
=
Gitlab
::
Badge
::
Build
::
Status
.
new
(
project
,
params
[
:ref
])
build_status
=
Gitlab
::
Badge
::
Build
::
Status
.
new
(
project
,
params
[
:ref
])
render_badge
build_status
end
def
coverage
...
...
@@ -9,10 +9,10 @@
render_badge
build_status
end
def
coverage
coverage_report
=
Gitlab
::
Badge
::
Coverage
::
Report
.
new
(
project
,
params
[
:ref
],
params
[
:job
])
coverage_report
=
Gitlab
::
Badge
::
Coverage
::
Report
.
new
(
project
,
params
[
:ref
],
params
[
:job
])
render_badge
coverage_report
end
...
...
app/controllers/projects/boards/issues_controller.rb
View file @
ad222f96
...
...
@@ -40,10 +40,10 @@
def
issue
@issue
||=
IssuesFinder
.
new
(
current_user
,
project_id:
project
.
id
)
.
execute
.
where
(
iid:
params
[
:id
])
.
first!
IssuesFinder
.
new
(
current_user
,
project_id:
project
.
id
)
.
execute
.
where
(
iid:
params
[
:id
])
.
first!
end
def
authorize_read_issue!
...
...
app/controllers/projects/commit_controller.rb
View file @
ad222f96
...
...
@@ -35,9 +35,9 @@
respond_to
do
|
format
|
format
.
html
format
.
json
do
render
json:
PipelineSerializer
.
new
(
project:
@project
,
user:
@current_user
)
.
represent
(
@pipelines
)
render
json:
PipelineSerializer
.
new
(
project:
@project
,
user:
@current_user
)
.
represent
(
@pipelines
)
end
end
end
...
...
app/controllers/projects/compare_controller.rb
View file @
ad222f96
...
...
@@ -46,8 +46,8 @@
end
def
define_diff_vars
@compare
=
CompareService
.
new
(
@project
,
@head_ref
)
.
execute
(
@project
,
@start_ref
)
@compare
=
CompareService
.
new
(
@project
,
@head_ref
)
.
execute
(
@project
,
@start_ref
)
if
@compare
@commits
=
@compare
.
commits
...
...
app/controllers/projects/environments_controller.rb
View file @
ad222f96
...
...
@@ -9,10 +9,10 @@
before_action
:verify_api_request!
,
only: :terminal_websocket_authorize
def
index
@environments
=
project
.
environments
.
with_state
(
params
[
:scope
]
||
:available
)
@environments
=
project
.
environments
.
with_state
(
params
[
:scope
]
||
:available
)
respond_to
do
|
format
|
format
.
html
format
.
json
do
render
json:
{
...
...
@@ -14,13 +14,13 @@
respond_to
do
|
format
|
format
.
html
format
.
json
do
render
json:
{
environments:
EnvironmentSerializer
.
new
(
project:
@project
,
user:
@current_user
)
.
with_pagination
(
request
,
response
)
.
within_folders
.
represent
(
@environments
),
environments:
EnvironmentSerializer
.
new
(
project:
@project
,
user:
@current_user
)
.
with_pagination
(
request
,
response
)
.
within_folders
.
represent
(
@environments
),
available_count:
project
.
environments
.
available
.
count
,
stopped_count:
project
.
environments
.
stopped
.
count
}
...
...
@@ -36,10 +36,10 @@
format
.
html
format
.
json
do
render
json:
{
environments:
EnvironmentSerializer
.
new
(
project:
@project
,
user:
@current_user
)
.
with_pagination
(
request
,
response
)
.
represent
(
@environments
),
environments:
EnvironmentSerializer
.
new
(
project:
@project
,
user:
@current_user
)
.
with_pagination
(
request
,
response
)
.
represent
(
@environments
),
available_count:
folder_environments
.
available
.
count
,
stopped_count:
folder_environments
.
stopped
.
count
}
...
...
app/controllers/projects/merge_requests_controller.rb
View file @
ad222f96
...
...
@@ -232,9 +232,9 @@
end
format
.
json
do
render
json:
PipelineSerializer
.
new
(
project:
@project
,
user:
@current_user
)
.
represent
(
@pipelines
)
render
json:
PipelineSerializer
.
new
(
project:
@project
,
user:
@current_user
)
.
represent
(
@pipelines
)
end
end
end
...
...
@@ -245,9 +245,9 @@
format
.
json
do
define_pipelines_vars
render
json:
PipelineSerializer
.
new
(
project:
@project
,
user:
@current_user
)
.
represent
(
@pipelines
)
render
json:
PipelineSerializer
.
new
(
project:
@project
,
user:
@current_user
)
.
represent
(
@pipelines
)
end
end
end
...
...
@@ -332,9 +332,9 @@
return
access_denied!
end
MergeRequests
::
MergeWhenPipelineSucceedsService
.
new
(
@project
,
current_user
)
.
cancel
(
@merge_request
)
MergeRequests
::
MergeWhenPipelineSucceedsService
.
new
(
@project
,
current_user
)
.
cancel
(
@merge_request
)
end
def
merge
...
...
@@ -361,9 +361,9 @@
end
if
@merge_request
.
head_pipeline
.
active?
MergeRequests
::
MergeWhenPipelineSucceedsService
.
new
(
@project
,
current_user
,
merge_params
)
.
execute
(
@merge_request
)
MergeRequests
::
MergeWhenPipelineSucceedsService
.
new
(
@project
,
current_user
,
merge_params
)
.
execute
(
@merge_request
)
@status
=
:merge_when_build_succeeds
elsif
@merge_request
.
head_pipeline
.
success?
...
...
@@ -639,8 +639,8 @@
end
def
merge_request_params
params
.
require
(
:merge_request
)
.
permit
(
merge_request_params_ce
)
params
.
require
(
:merge_request
)
.
permit
(
merge_request_params_ce
)
end
def
merge_request_params_ce
...
...
app/controllers/projects/pipelines_controller.rb
View file @
ad222f96
...
...
@@ -7,9 +7,9 @@
def
index
@scope
=
params
[
:scope
]
@pipelines
=
PipelinesFinder
.
new
(
project
)
.
execute
(
scope:
@scope
)
.
page
(
params
[
:page
])
.
per
(
30
)
@pipelines
=
PipelinesFinder
.
new
(
project
)
.
execute
(
scope:
@scope
)
.
page
(
params
[
:page
])
.
per
(
30
)
...
...
@@ -15,4 +15,4 @@
@running_count
=
PipelinesFinder
@running_count
=
PipelinesFinder
.
.
new
(
project
).
execute
(
scope:
'running'
).
count
...
...
@@ -17,5 +17,5 @@
.
new
(
project
).
execute
(
scope:
'running'
).
count
@pending_count
=
PipelinesFinder
@pending_count
=
PipelinesFinder
.
.
new
(
project
).
execute
(
scope:
'pending'
).
count
...
...
@@ -20,5 +20,5 @@
.
new
(
project
).
execute
(
scope:
'pending'
).
count
@finished_count
=
PipelinesFinder
@finished_count
=
PipelinesFinder
.
.
new
(
project
).
execute
(
scope:
'finished'
).
count
...
...
@@ -23,9 +23,9 @@
.
new
(
project
).
execute
(
scope:
'finished'
).
count
@pipelines_count
=
PipelinesFinder
@pipelines_count
=
PipelinesFinder
.
.
new
(
project
).
execute
.
count
respond_to
do
|
format
|
format
.
html
format
.
json
do
render
json:
{
...
...
@@ -26,13 +26,13 @@
.
new
(
project
).
execute
.
count
respond_to
do
|
format
|
format
.
html
format
.
json
do
render
json:
{
pipelines:
PipelineSerializer
.
new
(
project:
@project
,
user:
@current_user
)
.
with_pagination
(
request
,
response
)
.
represent
(
@pipelines
),
pipelines:
PipelineSerializer
.
new
(
project:
@project
,
user:
@current_user
)
.
with_pagination
(
request
,
response
)
.
represent
(
@pipelines
),
count:
{
all:
@pipelines_count
,
running:
@running_count
,
...
...
@@ -49,9 +49,9 @@
end
def
create
@pipeline
=
Ci
::
CreatePipelineService
.
new
(
project
,
current_user
,
create_params
)
.
execute
(
ignore_skip_ci:
true
,
save_on_errors:
false
)
@pipeline
=
Ci
::
CreatePipelineService
.
new
(
project
,
current_user
,
create_params
)
.
execute
(
ignore_skip_ci:
true
,
save_on_errors:
false
)
unless
@pipeline
.
persisted?
render
'new'
return
...
...
app/controllers/projects_controller.rb
View file @
ad222f96
...
...
@@ -293,8 +293,8 @@
end
def
project_params
params
.
require
(
:project
)
.
permit
(
project_params_ce
)
params
.
require
(
:project
)
.
permit
(
project_params_ce
)
end
def
project_params_ce
...
...
app/controllers/users_controller.rb
View file @
ad222f96
...
...
@@ -118,8 +118,8 @@
def
load_projects
@projects
=
PersonalProjectsFinder
.
new
(
user
).
execute
(
current_user
)
.
page
(
params
[
:page
])
PersonalProjectsFinder
.
new
(
user
).
execute
(
current_user
)
.
page
(
params
[
:page
])
end
def
load_contributed_projects
...
...
app/finders/environments_finder.rb
View file @
ad222f96
...
...
@@ -17,7 +17,7 @@
deployments
.
none
end
environment_ids
=
deployments
.
group
(
:environment_id
)
.
select
(
:environment_id
)
environment_ids
=
deployments
.
group
(
:environment_id
)
.
select
(
:environment_id
)
...
...
@@ -23,6 +23,6 @@
environments
=
project
.
environments
.
available
.
where
(
id:
environment_ids
).
order_by_last_deployed_at
.
to_a
environments
=
project
.
environments
.
available
.
where
(
id:
environment_ids
).
order_by_last_deployed_at
.
to_a
environments
.
select!
do
|
environment
|
Ability
.
allowed?
(
current_user
,
:read_environment
,
environment
)
...
...
app/models/ci/build.rb
View file @
ad222f96
...
...
@@ -63,9 +63,9 @@
end
def
retry
(
build
,
current_user
)
Ci
::
RetryBuildService
.
new
(
build
.
project
,
current_user
)
.
execute
(
build
)
Ci
::
RetryBuildService
.
new
(
build
.
project
,
current_user
)
.
execute
(
build
)
end
end
...
...
@@ -96,9 +96,9 @@
end
def
detailed_status
(
current_user
)
Gitlab
::
Ci
::
Status
::
Build
::
Factory
.
new
(
self
,
current_user
)
.
fabricate!
Gitlab
::
Ci
::
Status
::
Build
::
Factory
.
new
(
self
,
current_user
)
.
fabricate!
end
def
manual?
...
...
@@ -220,9 +220,9 @@
end
def
merge_request
merge_requests
=
MergeRequest
.
includes
(
:merge_request_diff
)
.
where
(
source_branch:
ref
,
source_project_id:
pipeline
.
gl_project_id
)
.
reorder
(
iid: :asc
)
merge_requests
=
MergeRequest
.
includes
(
:merge_request_diff
)
.
where
(
source_branch:
ref
,
source_project_id:
pipeline
.
gl_project_id
)
.
reorder
(
iid: :asc
)
merge_requests
.
find
do
|
merge_request
|
merge_request
.
commits_sha
.
include?
(
pipeline
.
sha
)
...
...
app/models/ci/pipeline.rb
View file @
ad222f96
...
...
@@ -89,9 +89,9 @@
# ref can't be HEAD or SHA, can only be branch/tag name
scope
:latest
,
->
(
ref
=
nil
)
do
max_id
=
unscope
(
:select
)
.
select
(
"max(
#{
quoted_table_name
}
.id)"
)
.
group
(
:ref
,
:sha
)
max_id
=
unscope
(
:select
)
.
select
(
"max(
#{
quoted_table_name
}
.id)"
)
.
group
(
:ref
,
:sha
)
if
ref
where
(
ref:
ref
,
id:
max_id
.
where
(
ref:
ref
))
...
...
@@ -133,8 +133,8 @@
def
stages
# TODO, this needs refactoring, see gitlab-ce#26481.
stages_query
=
statuses
.
group
(
'stage'
).
select
(
:stage
).
order
(
'max(stage_idx)'
)
stages_query
=
statuses
.
group
(
'stage'
).
select
(
:stage
).
order
(
'max(stage_idx)'
)
status_sql
=
statuses
.
latest
.
where
(
'stage=sg.stage'
).
status_sql
...
...
@@ -138,6 +138,6 @@
status_sql
=
statuses
.
latest
.
where
(
'stage=sg.stage'
).
status_sql
warnings_sql
=
statuses
.
latest
.
select
(
'COUNT(*) > 0'
)
.
where
(
'stage=sg.stage'
).
failed_but_allowed
.
to_sql
warnings_sql
=
statuses
.
latest
.
select
(
'COUNT(*) > 0'
)
.
where
(
'stage=sg.stage'
).
failed_but_allowed
.
to_sql
...
...
@@ -143,6 +143,6 @@
stages_with_statuses
=
CommitStatus
.
from
(
stages_query
,
:sg
)
.
pluck
(
'sg.stage'
,
status_sql
,
"(
#{
warnings_sql
}
)"
)
stages_with_statuses
=
CommitStatus
.
from
(
stages_query
,
:sg
)
.
pluck
(
'sg.stage'
,
status_sql
,
"(
#{
warnings_sql
}
)"
)
stages_with_statuses
.
map
do
|
stage
|
Ci
::
Stage
.
new
(
self
,
Hash
[
%i[name status warnings]
.
zip
(
stage
)])
...
...
@@ -222,8 +222,8 @@
end
def
retry_failed
(
current_user
)
Ci
::
RetryPipelineService
.
new
(
project
,
current_user
)
.
execute
(
self
)
Ci
::
RetryPipelineService
.
new
(
project
,
current_user
)
.
execute
(
self
)
end
def
mark_as_processable_after_stage
(
stage_idx
)
...
...
@@ -355,9 +355,9 @@
# Merge requests for which the current pipeline is running against
# the merge request's latest commit.
def
merge_requests
@merge_requests
||=
project
.
merge_requests
.
where
(
source_branch:
self
.
ref
)
.
select
{
|
merge_request
|
merge_request
.
head_pipeline
.
try
(
:id
)
==
self
.
id
}
@merge_requests
||=
project
.
merge_requests
.
where
(
source_branch:
self
.
ref
)
.
select
{
|
merge_request
|
merge_request
.
head_pipeline
.
try
(
:id
)
==
self
.
id
}
end
def
detailed_status
(
current_user
)
...
...
@@ -361,9 +361,9 @@
end
def
detailed_status
(
current_user
)
Gitlab
::
Ci
::
Status
::
Pipeline
::
Factory
.
new
(
self
,
current_user
)
.
fabricate!
Gitlab
::
Ci
::
Status
::
Pipeline
::
Factory
.
new
(
self
,
current_user
)
.
fabricate!
end
private
...
...
app/models/ci/runner.rb
View file @
ad222f96
...
...
@@ -23,8 +23,8 @@
scope
:ordered
,
->
()
{
order
(
id: :desc
)
}
scope
:owned_or_shared
,
->
(
project_id
)
do
joins
(
'LEFT JOIN ci_runner_projects ON ci_runner_projects.runner_id = ci_runners.id'
)
.
where
(
"ci_runner_projects.gl_project_id = :project_id OR ci_runners.is_shared = true"
,
project_id:
project_id
)
joins
(
'LEFT JOIN ci_runner_projects ON ci_runner_projects.runner_id = ci_runners.id'
)
.
where
(
"ci_runner_projects.gl_project_id = :project_id OR ci_runners.is_shared = true"
,
project_id:
project_id
)
end
scope
:assignable_for
,
->
(
project
)
do
...
...
app/models/ci/stage.rb
View file @
ad222f96
...
...
@@ -28,9 +28,9 @@
end
def
detailed_status
(
current_user
)
Gitlab
::
Ci
::
Status
::
Stage
::
Factory
.
new
(
self
,
current_user
)
.
fabricate!
Gitlab
::
Ci
::
Status
::
Stage
::
Factory
.
new
(
self
,
current_user
)
.
fabricate!
end
def
statuses
...
...
Prev
1
2
3
4
5
…
10
Next
Write
Preview
Supports
Markdown
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