Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
GitLab
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
projects.thm.de
GitLab
Commits
3dadf306
Commit
3dadf306
authored
Feb 21, 2017
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Enable Style/DotPosition
parent
547063b3
Changes
188
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
188 changed files
with
868 additions
and
871 deletions
+868
-871
.rubocop.yml
.rubocop.yml
+4
-0
.rubocop_todo.yml
.rubocop_todo.yml
+0
-7
app/controllers/admin/application_settings_controller.rb
app/controllers/admin/application_settings_controller.rb
+3
-3
app/controllers/concerns/issues_action.rb
app/controllers/concerns/issues_action.rb
+3
-3
app/controllers/concerns/merge_requests_action.rb
app/controllers/concerns/merge_requests_action.rb
+2
-2
app/controllers/import/bitbucket_controller.rb
app/controllers/import/bitbucket_controller.rb
+3
-3
app/controllers/projects/badges_controller.rb
app/controllers/projects/badges_controller.rb
+4
-4
app/controllers/projects/boards/issues_controller.rb
app/controllers/projects/boards/issues_controller.rb
+4
-4
app/controllers/projects/commit_controller.rb
app/controllers/projects/commit_controller.rb
+3
-3
app/controllers/projects/compare_controller.rb
app/controllers/projects/compare_controller.rb
+2
-2
app/controllers/projects/environments_controller.rb
app/controllers/projects/environments_controller.rb
+11
-11
app/controllers/projects/merge_requests_controller.rb
app/controllers/projects/merge_requests_controller.rb
+14
-14
app/controllers/projects/pipelines_controller.rb
app/controllers/projects/pipelines_controller.rb
+16
-16
app/controllers/projects_controller.rb
app/controllers/projects_controller.rb
+2
-2
app/controllers/users_controller.rb
app/controllers/users_controller.rb
+2
-2
app/finders/environments_finder.rb
app/finders/environments_finder.rb
+5
-5
app/models/ci/build.rb
app/models/ci/build.rb
+9
-9
app/models/ci/pipeline.rb
app/models/ci/pipeline.rb
+17
-17
app/models/ci/runner.rb
app/models/ci/runner.rb
+2
-2
app/models/ci/stage.rb
app/models/ci/stage.rb
+3
-3
app/models/commit_status.rb
app/models/commit_status.rb
+5
-5
app/models/concerns/milestoneish.rb
app/models/concerns/milestoneish.rb
+2
-2
app/models/concerns/presentable.rb
app/models/concerns/presentable.rb
+3
-3
app/models/concerns/subscribable.rb
app/models/concerns/subscribable.rb
+4
-4
app/models/generic_commit_status.rb
app/models/generic_commit_status.rb
+3
-3
app/models/global_milestone.rb
app/models/global_milestone.rb
+2
-2
app/models/group.rb
app/models/group.rb
+3
-3
app/models/label.rb
app/models/label.rb
+3
-3
app/models/lfs_object.rb
app/models/lfs_object.rb
+3
-3
app/models/member.rb
app/models/member.rb
+3
-3
app/models/merge_request.rb
app/models/merge_request.rb
+3
-3
app/models/merge_request_diff.rb
app/models/merge_request_diff.rb
+2
-2
app/models/namespace.rb
app/models/namespace.rb
+3
-3
app/models/network/commit.rb
app/models/network/commit.rb
+2
-2
app/models/network/graph.rb
app/models/network/graph.rb
+6
-6
app/serializers/base_serializer.rb
app/serializers/base_serializer.rb
+3
-3
app/serializers/environment_serializer.rb
app/serializers/environment_serializer.rb
+3
-3
app/services/after_branch_delete_service.rb
app/services/after_branch_delete_service.rb
+3
-3
app/services/boards/issues/list_service.rb
app/services/boards/issues/list_service.rb
+4
-4
app/services/boards/lists/destroy_service.rb
app/services/boards/lists/destroy_service.rb
+2
-2
app/services/boards/lists/move_service.rb
app/services/boards/lists/move_service.rb
+6
-6
app/services/ci/create_pipeline_service.rb
app/services/ci/create_pipeline_service.rb
+3
-3
app/services/ci/process_pipeline_service.rb
app/services/ci/process_pipeline_service.rb
+3
-3
app/services/ci/retry_build_service.rb
app/services/ci/retry_build_service.rb
+5
-5
app/services/ci/retry_pipeline_service.rb
app/services/ci/retry_pipeline_service.rb
+5
-5
app/services/commits/change_service.rb
app/services/commits/change_service.rb
+2
-2
app/services/create_branch_service.rb
app/services/create_branch_service.rb
+2
-2
app/services/git_push_service.rb
app/services/git_push_service.rb
+5
-5
app/services/issues/move_service.rb
app/services/issues/move_service.rb
+2
-2
app/services/merge_requests/base_service.rb
app/services/merge_requests/base_service.rb
+5
-5
app/services/merge_requests/refresh_service.rb
app/services/merge_requests/refresh_service.rb
+3
-3
app/workers/build_coverage_worker.rb
app/workers/build_coverage_worker.rb
+2
-2
app/workers/build_hooks_worker.rb
app/workers/build_hooks_worker.rb
+2
-2
app/workers/emails_on_push_worker.rb
app/workers/emails_on_push_worker.rb
+4
-4
app/workers/expire_build_instance_artifacts_worker.rb
app/workers/expire_build_instance_artifacts_worker.rb
+4
-4
app/workers/pipeline_hooks_worker.rb
app/workers/pipeline_hooks_worker.rb
+2
-2
app/workers/pipeline_process_worker.rb
app/workers/pipeline_process_worker.rb
+2
-2
app/workers/pipeline_success_worker.rb
app/workers/pipeline_success_worker.rb
+3
-3
app/workers/pipeline_update_worker.rb
app/workers/pipeline_update_worker.rb
+2
-2
lib/api/merge_requests.rb
lib/api/merge_requests.rb
+9
-9
lib/api/pipelines.rb
lib/api/pipelines.rb
+2
-2
lib/api/v3/merge_requests.rb
lib/api/v3/merge_requests.rb
+9
-9
lib/banzai/pipeline/wiki_pipeline.rb
lib/banzai/pipeline/wiki_pipeline.rb
+2
-2
lib/banzai/reference_extractor.rb
lib/banzai/reference_extractor.rb
+2
-2
lib/ci/gitlab_ci_yaml_processor.rb
lib/ci/gitlab_ci_yaml_processor.rb
+2
-2
lib/gitlab/badge/build/status.rb
lib/gitlab/badge/build/status.rb
+3
-3
lib/gitlab/badge/coverage/report.rb
lib/gitlab/badge/coverage/report.rb
+3
-3
lib/gitlab/bitbucket_import/importer.rb
lib/gitlab/bitbucket_import/importer.rb
+4
-4
lib/gitlab/checks/matching_merge_request.rb
lib/gitlab/checks/matching_merge_request.rb
+4
-4
lib/gitlab/ci/config/entry/configurable.rb
lib/gitlab/ci/config/entry/configurable.rb
+5
-5
lib/gitlab/ci/config/entry/global.rb
lib/gitlab/ci/config/entry/global.rb
+3
-3
lib/gitlab/ci/config/entry/jobs.rb
lib/gitlab/ci/config/entry/jobs.rb
+4
-4
lib/gitlab/ci/status/factory.rb
lib/gitlab/ci/status/factory.rb
+4
-4
lib/gitlab/ci/trace_reader.rb
lib/gitlab/ci/trace_reader.rb
+2
-2
lib/gitlab/git/encoding_helper.rb
lib/gitlab/git/encoding_helper.rb
+3
-3
lib/gitlab/github_import/importer.rb
lib/gitlab/github_import/importer.rb
+3
-3
lib/gitlab/github_import/user_formatter.rb
lib/gitlab/github_import/user_formatter.rb
+7
-7
rubocop/cop/gem_fetcher.rb
rubocop/cop/gem_fetcher.rb
+6
-6
spec/controllers/ci/projects_controller_spec.rb
spec/controllers/ci/projects_controller_spec.rb
+2
-2
spec/controllers/projects/merge_requests_controller_spec.rb
spec/controllers/projects/merge_requests_controller_spec.rb
+3
-3
spec/controllers/sessions_controller_spec.rb
spec/controllers/sessions_controller_spec.rb
+10
-10
spec/features/environments_spec.rb
spec/features/environments_spec.rb
+2
-2
spec/features/merge_requests/created_from_fork_spec.rb
spec/features/merge_requests/created_from_fork_spec.rb
+2
-2
spec/features/projects/pipelines/pipelines_spec.rb
spec/features/projects/pipelines/pipelines_spec.rb
+2
-2
spec/finders/environments_finder_spec.rb
spec/finders/environments_finder_spec.rb
+22
-22
spec/helpers/issues_helper_spec.rb
spec/helpers/issues_helper_spec.rb
+4
-4
spec/helpers/page_layout_helper_spec.rb
spec/helpers/page_layout_helper_spec.rb
+2
-2
spec/helpers/visibility_level_helper_spec.rb
spec/helpers/visibility_level_helper_spec.rb
+16
-16
spec/lib/api/helpers/pagination_spec.rb
spec/lib/api/helpers/pagination_spec.rb
+6
-6
spec/lib/banzai/filter/external_issue_reference_filter_spec.rb
...lib/banzai/filter/external_issue_reference_filter_spec.rb
+2
-2
spec/lib/banzai/filter/label_reference_filter_spec.rb
spec/lib/banzai/filter/label_reference_filter_spec.rb
+14
-14
spec/lib/banzai/filter/user_reference_filter_spec.rb
spec/lib/banzai/filter/user_reference_filter_spec.rb
+2
-2
spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
+10
-10
spec/lib/gitlab/asciidoc_spec.rb
spec/lib/gitlab/asciidoc_spec.rb
+4
-4
spec/lib/gitlab/auth_spec.rb
spec/lib/gitlab/auth_spec.rb
+4
-4
spec/lib/gitlab/backup/manager_spec.rb
spec/lib/gitlab/backup/manager_spec.rb
+8
-8
spec/lib/gitlab/badge/build/status_spec.rb
spec/lib/gitlab/badge/build/status_spec.rb
+2
-2
spec/lib/gitlab/ci/config/entry/artifacts_spec.rb
spec/lib/gitlab/ci/config/entry/artifacts_spec.rb
+4
-4
spec/lib/gitlab/ci/config/entry/attributable_spec.rb
spec/lib/gitlab/ci/config/entry/attributable_spec.rb
+6
-6
spec/lib/gitlab/ci/config/entry/boolean_spec.rb
spec/lib/gitlab/ci/config/entry/boolean_spec.rb
+2
-2
spec/lib/gitlab/ci/config/entry/cache_spec.rb
spec/lib/gitlab/ci/config/entry/cache_spec.rb
+6
-6
spec/lib/gitlab/ci/config/entry/commands_spec.rb
spec/lib/gitlab/ci/config/entry/commands_spec.rb
+2
-2
spec/lib/gitlab/ci/config/entry/configurable_spec.rb
spec/lib/gitlab/ci/config/entry/configurable_spec.rb
+2
-2
spec/lib/gitlab/ci/config/entry/environment_spec.rb
spec/lib/gitlab/ci/config/entry/environment_spec.rb
+8
-8
spec/lib/gitlab/ci/config/entry/factory_spec.rb
spec/lib/gitlab/ci/config/entry/factory_spec.rb
+26
-26
spec/lib/gitlab/ci/config/entry/global_spec.rb
spec/lib/gitlab/ci/config/entry/global_spec.rb
+22
-22
spec/lib/gitlab/ci/config/entry/image_spec.rb
spec/lib/gitlab/ci/config/entry/image_spec.rb
+2
-2
spec/lib/gitlab/ci/config/entry/job_spec.rb
spec/lib/gitlab/ci/config/entry/job_spec.rb
+4
-4
spec/lib/gitlab/ci/config/entry/jobs_spec.rb
spec/lib/gitlab/ci/config/entry/jobs_spec.rb
+8
-8
spec/lib/gitlab/ci/config/entry/key_spec.rb
spec/lib/gitlab/ci/config/entry/key_spec.rb
+2
-2
spec/lib/gitlab/ci/config/entry/paths_spec.rb
spec/lib/gitlab/ci/config/entry/paths_spec.rb
+2
-2
spec/lib/gitlab/ci/config/entry/script_spec.rb
spec/lib/gitlab/ci/config/entry/script_spec.rb
+2
-2
spec/lib/gitlab/ci/config/entry/services_spec.rb
spec/lib/gitlab/ci/config/entry/services_spec.rb
+2
-2
spec/lib/gitlab/ci/config/entry/stage_spec.rb
spec/lib/gitlab/ci/config/entry/stage_spec.rb
+2
-2
spec/lib/gitlab/ci/config/entry/stages_spec.rb
spec/lib/gitlab/ci/config/entry/stages_spec.rb
+2
-2
spec/lib/gitlab/ci/config/entry/trigger_spec.rb
spec/lib/gitlab/ci/config/entry/trigger_spec.rb
+2
-2
spec/lib/gitlab/ci/config/entry/validatable_spec.rb
spec/lib/gitlab/ci/config/entry/validatable_spec.rb
+2
-2
spec/lib/gitlab/ci/config/entry/validator_spec.rb
spec/lib/gitlab/ci/config/entry/validator_spec.rb
+2
-2
spec/lib/gitlab/ci/config/entry/variables_spec.rb
spec/lib/gitlab/ci/config/entry/variables_spec.rb
+2
-2
spec/lib/gitlab/ci/status/build/common_spec.rb
spec/lib/gitlab/ci/status/build/common_spec.rb
+3
-3
spec/lib/gitlab/ci/status/build/factory_spec.rb
spec/lib/gitlab/ci/status/build/factory_spec.rb
+16
-16
spec/lib/gitlab/ci/status/extended_spec.rb
spec/lib/gitlab/ci/status/extended_spec.rb
+2
-2
spec/lib/gitlab/ci/status/external/common_spec.rb
spec/lib/gitlab/ci/status/external/common_spec.rb
+3
-3
spec/lib/gitlab/ci/status/factory_spec.rb
spec/lib/gitlab/ci/status/factory_spec.rb
+8
-8
spec/lib/gitlab/ci/status/pipeline/common_spec.rb
spec/lib/gitlab/ci/status/pipeline/common_spec.rb
+5
-5
spec/lib/gitlab/ci/status/pipeline/factory_spec.rb
spec/lib/gitlab/ci/status/pipeline/factory_spec.rb
+4
-4
spec/lib/gitlab/ci/status/stage/common_spec.rb
spec/lib/gitlab/ci/status/stage/common_spec.rb
+6
-6
spec/lib/gitlab/ci/status/stage/factory_spec.rb
spec/lib/gitlab/ci/status/stage/factory_spec.rb
+2
-2
spec/lib/gitlab/data_builder/note_spec.rb
spec/lib/gitlab/data_builder/note_spec.rb
+18
-18
spec/lib/gitlab/database_spec.rb
spec/lib/gitlab/database_spec.rb
+2
-2
spec/lib/gitlab/import_export/avatar_restorer_spec.rb
spec/lib/gitlab/import_export/avatar_restorer_spec.rb
+2
-2
spec/lib/gitlab/incoming_email_spec.rb
spec/lib/gitlab/incoming_email_spec.rb
+2
-2
spec/lib/gitlab/ldap/adapter_spec.rb
spec/lib/gitlab/ldap/adapter_spec.rb
+2
-2
spec/lib/gitlab/o_auth/user_spec.rb
spec/lib/gitlab/o_auth/user_spec.rb
+2
-2
spec/lib/gitlab/serializer/pagination_spec.rb
spec/lib/gitlab/serializer/pagination_spec.rb
+4
-4
spec/models/application_setting_spec.rb
spec/models/application_setting_spec.rb
+3
-3
spec/models/ci/build_spec.rb
spec/models/ci/build_spec.rb
+8
-8
spec/models/commit_status_spec.rb
spec/models/commit_status_spec.rb
+2
-2
spec/models/email_spec.rb
spec/models/email_spec.rb
+2
-2
spec/models/group_label_spec.rb
spec/models/group_label_spec.rb
+2
-2
spec/models/lfs_objects_project_spec.rb
spec/models/lfs_objects_project_spec.rb
+4
-4
spec/models/merge_request_diff_spec.rb
spec/models/merge_request_diff_spec.rb
+4
-4
spec/models/merge_request_spec.rb
spec/models/merge_request_spec.rb
+12
-12
spec/models/project_label_spec.rb
spec/models/project_label_spec.rb
+6
-6
spec/models/repository_spec.rb
spec/models/repository_spec.rb
+2
-2
spec/models/user_spec.rb
spec/models/user_spec.rb
+4
-4
spec/requests/api/broadcast_messages_spec.rb
spec/requests/api/broadcast_messages_spec.rb
+6
-6
spec/requests/api/commit_statuses_spec.rb
spec/requests/api/commit_statuses_spec.rb
+2
-2
spec/requests/api/groups_spec.rb
spec/requests/api/groups_spec.rb
+4
-4
spec/requests/api/internal_spec.rb
spec/requests/api/internal_spec.rb
+2
-2
spec/requests/api/runners_spec.rb
spec/requests/api/runners_spec.rb
+4
-4
spec/requests/ci/api/builds_spec.rb
spec/requests/ci/api/builds_spec.rb
+6
-6
spec/serializers/analytics_build_serializer_spec.rb
spec/serializers/analytics_build_serializer_spec.rb
+2
-2
spec/serializers/analytics_issue_serializer_spec.rb
spec/serializers/analytics_issue_serializer_spec.rb
+3
-3
spec/serializers/analytics_merge_request_serializer_spec.rb
spec/serializers/analytics_merge_request_serializer_spec.rb
+3
-3
spec/serializers/analytics_summary_serializer_spec.rb
spec/serializers/analytics_summary_serializer_spec.rb
+4
-4
spec/serializers/build_artifact_entity_spec.rb
spec/serializers/build_artifact_entity_spec.rb
+2
-2
spec/serializers/commit_entity_spec.rb
spec/serializers/commit_entity_spec.rb
+2
-2
spec/serializers/environment_serializer_spec.rb
spec/serializers/environment_serializer_spec.rb
+16
-16
spec/serializers/pipeline_entity_spec.rb
spec/serializers/pipeline_entity_spec.rb
+6
-6
spec/serializers/pipeline_serializer_spec.rb
spec/serializers/pipeline_serializer_spec.rb
+5
-5
spec/serializers/request_aware_entity_spec.rb
spec/serializers/request_aware_entity_spec.rb
+2
-2
spec/serializers/stage_entity_spec.rb
spec/serializers/stage_entity_spec.rb
+4
-4
spec/services/ci/process_pipeline_service_spec.rb
spec/services/ci/process_pipeline_service_spec.rb
+4
-4
spec/services/ci/retry_build_service_spec.rb
spec/services/ci/retry_build_service_spec.rb
+6
-6
spec/services/ci/retry_pipeline_service_spec.rb
spec/services/ci/retry_pipeline_service_spec.rb
+4
-4
spec/services/ci/stop_environments_service_spec.rb
spec/services/ci/stop_environments_service_spec.rb
+8
-8
spec/services/ci/update_build_queue_service_spec.rb
spec/services/ci/update_build_queue_service_spec.rb
+8
-8
spec/services/issuable/bulk_update_service_spec.rb
spec/services/issuable/bulk_update_service_spec.rb
+10
-10
spec/services/issues/move_service_spec.rb
spec/services/issues/move_service_spec.rb
+10
-10
spec/services/merge_requests/add_todo_when_build_fails_service_spec.rb
.../merge_requests/add_todo_when_build_fails_service_spec.rb
+8
-8
spec/services/merge_requests/merge_when_pipeline_succeeds_service_spec.rb
...rge_requests/merge_when_pipeline_succeeds_service_spec.rb
+10
-10
spec/services/todo_service_spec.rb
spec/services/todo_service_spec.rb
+4
-4
spec/support/ldap_helpers.rb
spec/support/ldap_helpers.rb
+4
-4
spec/tasks/gitlab/check_rake_spec.rb
spec/tasks/gitlab/check_rake_spec.rb
+2
-2
spec/tasks/gitlab/shell_rake_spec.rb
spec/tasks/gitlab/shell_rake_spec.rb
+2
-2
spec/views/layouts/_head.html.haml_spec.rb
spec/views/layouts/_head.html.haml_spec.rb
+2
-2
spec/views/projects/merge_requests/edit.html.haml_spec.rb
spec/views/projects/merge_requests/edit.html.haml_spec.rb
+2
-2
spec/workers/build_coverage_worker_spec.rb
spec/workers/build_coverage_worker_spec.rb
+4
-4
spec/workers/build_finished_worker_spec.rb
spec/workers/build_finished_worker_spec.rb
+10
-10
spec/workers/build_hooks_worker_spec.rb
spec/workers/build_hooks_worker_spec.rb
+4
-4
spec/workers/build_success_worker_spec.rb
spec/workers/build_success_worker_spec.rb
+6
-6
spec/workers/pipeline_hooks_worker_spec.rb
spec/workers/pipeline_hooks_worker_spec.rb
+4
-4
spec/workers/pipeline_proccess_worker_spec.rb
spec/workers/pipeline_proccess_worker_spec.rb
+2
-2
spec/workers/pipeline_success_worker_spec.rb
spec/workers/pipeline_success_worker_spec.rb
+2
-2
spec/workers/pipeline_update_worker_spec.rb
spec/workers/pipeline_update_worker_spec.rb
+2
-2
spec/workers/project_cache_worker_spec.rb
spec/workers/project_cache_worker_spec.rb
+6
-6
spec/workers/use_key_worker_spec.rb
spec/workers/use_key_worker_spec.rb
+2
-2
No files found.
.rubocop.yml
View file @
3dadf306
...
...
@@ -136,6 +136,10 @@ Style/DefWithParentheses:
Style/Documentation
:
Enabled
:
false
Style/DotPosition
:
Enabled
:
true
EnforcedStyle
:
trailing
# Align elses and elsifs correctly.
Style/ElseAlignment
:
Enabled
:
true
...
...
.rubocop_todo.yml
View file @
3dadf306
...
...
@@ -305,13 +305,6 @@ Style/CommentAnnotation:
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 @
3dadf306
...
...
@@ -5,9 +5,9 @@ def show
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 @
3dadf306
...
...
@@ -5,9 +5,9 @@ module IssuesAction
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 @
3dadf306
...
...
@@ -5,8 +5,8 @@ module MergeRequestsAction
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 @
3dadf306
...
...
@@ -29,9 +29,9 @@ def status
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 @
3dadf306
...
...
@@ -4,15 +4,15 @@ class Projects::BadgesController < Projects::ApplicationController
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
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 @
3dadf306
...
...
@@ -40,10 +40,10 @@ def update
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 @
3dadf306
...
...
@@ -35,9 +35,9 @@ def pipelines
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 @
3dadf306
...
...
@@ -46,8 +46,8 @@ def define_ref_vars
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 @
3dadf306
...
...
@@ -9,18 +9,18 @@ class Projects::EnvironmentsController < Projects::ApplicationController
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:
{
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 @@ def folder
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 @
3dadf306
...
...
@@ -232,9 +232,9 @@ def pipelines
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 @@ def new
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 @@ def cancel_merge_when_build_succeeds
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 @@ def merge
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 @@ def invalid_mr
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 @
3dadf306
...
...
@@ -7,32 +7,32 @@ class Projects::PipelinesController < Projects::ApplicationController
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
)
@running_count
=
PipelinesFinder
@running_count
=
PipelinesFinder
.
.
new
(
project
).
execute
(
scope:
'running'
).
count
@pending_count
=
PipelinesFinder
@pending_count
=
PipelinesFinder
.
.
new
(
project
).
execute
(
scope:
'pending'
).
count
@finished_count
=
PipelinesFinder
@finished_count
=
PipelinesFinder
.
.
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:
{
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 @@ def new
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 @
3dadf306
...
...
@@ -293,8 +293,8 @@ def load_events
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 @
3dadf306
...
...
@@ -118,8 +118,8 @@ def load_events
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 @
3dadf306
...
...
@@ -17,12 +17,12 @@ def execute
deployments
.
none
end
environment_ids
=
deployments
.
group
(
:environment_id
)
.
select
(
:environment_id
)
environment_ids
=
deployments
.
group
(
:environment_id
).
select
(
:environment_id
)
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 @
3dadf306
...
...
@@ -63,9 +63,9 @@ def create_from(build)
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 @@ def retry(build, current_user)
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 @@ def variables
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 @
3dadf306
...
...
@@ -89,9 +89,9 @@ class Pipeline < ActiveRecord::Base
# 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,16 +133,16 @@ def stages_name
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
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
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 @@ def cancel_running
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,15 +355,15 @@ def execute_hooks
# 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
)
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 @
3dadf306
...
...
@@ -23,8 +23,8 @@ class Runner < ActiveRecord::Base
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 @
3dadf306
...
...
@@ -28,9 +28,9 @@ def status
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
...
...
app/models/commit_status.rb
View file @
3dadf306
...
...
@@ -96,8 +96,8 @@ class CommitStatus < ActiveRecord::Base
after_transition
any
=>
:failed
do
|
commit_status
|
commit_status
.
run_after_commit
do
MergeRequests
::
AddTodoWhenBuildFailsService
.
new
(
pipeline
.
project
,
nil
).
execute
(
self
)
MergeRequests
::
AddTodoWhenBuildFailsService
.
new
(
pipeline
.
project
,
nil
).
execute
(
self
)
end
end
end
...
...
@@ -133,9 +133,9 @@ def has_trace?
end
def
detailed_status
(
current_user
)
Gitlab
::
Ci
::
Status
::
Factory
.
new
(
self
,
current_user
)
.
fabricate!
Gitlab
::
Ci
::
Status
::
Factory
.
new
(
self
,
current_user
).
fabricate!
end
def
sortable_name
...
...
app/models/concerns/milestoneish.rb
View file @
3dadf306
...
...
@@ -39,8 +39,8 @@ def elapsed_days
def
issues_visible_to_user
(
user
)
memoize_per_user
(
user
,
:issues_visible_to_user
)
do
IssuesFinder
.
new
(
user
,
issues_finder_params
)
.
execute
.
where
(
milestone_id:
milestoneish_ids
)
IssuesFinder
.
new
(
user
,
issues_finder_params
)
.
execute
.
where
(
milestone_id:
milestoneish_ids
)
end
end
...
...
app/models/concerns/presentable.rb
View file @
3dadf306
module
Presentable
def
present
(
**
attributes
)
Gitlab
::
View
::
Presenter
::
Factory
.
new
(
self
,
attributes
)
.
fabricate!
Gitlab
::
View
::
Presenter
::
Factory
.
new
(
self
,
attributes
).
fabricate!
end
end
app/models/concerns/subscribable.rb
View file @
3dadf306
...
...
@@ -42,15 +42,15 @@ def toggle_subscription(user, project = nil)
def
subscribe
(
user
,
project
=
nil
)
unsubscribe_from_other_levels
(
user
,
project
)
find_or_initialize_subscription
(
user
,
project
)
.
update
(
subscribed:
true
)
find_or_initialize_subscription
(
user
,
project
)
.
update
(
subscribed:
true
)
end
def
unsubscribe
(
user
,
project
=
nil
)
unsubscribe_from_other_levels
(
user
,
project
)
find_or_initialize_subscription
(
user
,
project
)
.
update
(
subscribed:
false
)
find_or_initialize_subscription
(
user
,
project
)
.
update
(
subscribed:
false
)
end
private
...
...