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
0430b764
Commit
0430b764
authored
Jun 21, 2017
by
Grzegorz Bizon
Committed by
Rémy Coutable
Jun 21, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Enable Style/DotPosition Rubocop
👮
parent
78ee24ba
Changes
359
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
359 changed files
with
2844 additions
and
2849 deletions
+2844
-2849
.rubocop.yml
.rubocop.yml
+5
-0
.rubocop_todo.yml
.rubocop_todo.yml
+0
-7
app/controllers/concerns/creates_commit.rb
app/controllers/concerns/creates_commit.rb
+2
-2
app/controllers/concerns/membership_actions.rb
app/controllers/concerns/membership_actions.rb
+4
-4
app/controllers/dashboard/projects_controller.rb
app/controllers/dashboard/projects_controller.rb
+4
-4
app/controllers/explore/projects_controller.rb
app/controllers/explore/projects_controller.rb
+2
-2
app/controllers/jwt_controller.rb
app/controllers/jwt_controller.rb
+2
-2
app/controllers/omniauth_callbacks_controller.rb
app/controllers/omniauth_callbacks_controller.rb
+2
-2
app/controllers/profiles_controller.rb
app/controllers/profiles_controller.rb
+3
-3
app/controllers/projects/blob_controller.rb
app/controllers/projects/blob_controller.rb
+2
-2
app/controllers/projects/branches_controller.rb
app/controllers/projects/branches_controller.rb
+2
-2
app/controllers/projects/commits_controller.rb
app/controllers/projects/commits_controller.rb
+4
-4
app/controllers/projects/compare_controller.rb
app/controllers/projects/compare_controller.rb
+2
-2
app/controllers/projects/merge_requests_controller.rb
app/controllers/projects/merge_requests_controller.rb
+7
-7
app/controllers/projects/settings/ci_cd_controller.rb
app/controllers/projects/settings/ci_cd_controller.rb
+2
-2
app/controllers/projects/tags_controller.rb
app/controllers/projects/tags_controller.rb
+2
-2
app/controllers/sessions_controller.rb
app/controllers/sessions_controller.rb
+2
-2
app/controllers/sherlock/application_controller.rb
app/controllers/sherlock/application_controller.rb
+2
-2
app/controllers/users_controller.rb
app/controllers/users_controller.rb
+5
-5
app/finders/events_finder.rb
app/finders/events_finder.rb
+2
-2
app/finders/group_members_finder.rb
app/finders/group_members_finder.rb
+3
-3
app/helpers/form_helper.rb
app/helpers/form_helper.rb
+4
-4
app/helpers/projects_helper.rb
app/helpers/projects_helper.rb
+2
-2
app/helpers/search_helper.rb
app/helpers/search_helper.rb
+2
-2
app/helpers/wiki_helper.rb
app/helpers/wiki_helper.rb
+3
-3
app/models/award_emoji.rb
app/models/award_emoji.rb
+3
-3
app/models/ci/pipeline.rb
app/models/ci/pipeline.rb
+2
-2
app/models/ci/runner.rb
app/models/ci/runner.rb
+2
-2
app/models/concerns/issuable.rb
app/models/concerns/issuable.rb
+6
-6
app/models/concerns/relative_positioning.rb
app/models/concerns/relative_positioning.rb
+8
-8
app/models/concerns/sortable.rb
app/models/concerns/sortable.rb
+6
-6
app/models/concerns/subscribable.rb
app/models/concerns/subscribable.rb
+9
-9
app/models/deployment.rb
app/models/deployment.rb
+11
-11
app/models/environment.rb
app/models/environment.rb
+3
-3
app/models/event.rb
app/models/event.rb
+5
-5
app/models/group.rb
app/models/group.rb
+6
-6
app/models/issue.rb
app/models/issue.rb
+2
-2
app/models/issue_collection.rb
app/models/issue_collection.rb
+3
-3
app/models/label.rb
app/models/label.rb
+6
-6
app/models/member.rb
app/models/member.rb
+3
-3
app/models/merge_request.rb
app/models/merge_request.rb
+2
-2
app/models/merge_requests_closing_issues.rb
app/models/merge_requests_closing_issues.rb
+3
-3
app/models/milestone.rb
app/models/milestone.rb
+5
-5
app/models/namespace.rb
app/models/namespace.rb
+10
-10
app/models/note.rb
app/models/note.rb
+3
-3
app/models/project.rb
app/models/project.rb
+18
-18
app/models/project_authorization.rb
app/models/project_authorization.rb
+3
-3
app/models/project_services/mattermost_slash_commands_service.rb
...els/project_services/mattermost_slash_commands_service.rb
+2
-2
app/models/project_team.rb
app/models/project_team.rb
+4
-4
app/models/repository.rb
app/models/repository.rb
+4
-4
app/models/todo.rb
app/models/todo.rb
+3
-3
app/models/user.rb
app/models/user.rb
+28
-28
app/models/wiki_page.rb
app/models/wiki_page.rb
+5
-5
app/services/ci/create_pipeline_service.rb
app/services/ci/create_pipeline_service.rb
+2
-2
app/services/ci/create_trigger_request_service.rb
app/services/ci/create_trigger_request_service.rb
+2
-2
app/services/ci/register_job_service.rb
app/services/ci/register_job_service.rb
+7
-7
app/services/concerns/issues/resolve_discussions.rb
app/services/concerns/issues/resolve_discussions.rb
+3
-3
app/services/files/update_service.rb
app/services/files/update_service.rb
+2
-2
app/services/git_push_service.rb
app/services/git_push_service.rb
+2
-2
app/services/issuable_base_service.rb
app/services/issuable_base_service.rb
+2
-2
app/services/issues/create_service.rb
app/services/issues/create_service.rb
+2
-2
app/services/labels/promote_service.rb
app/services/labels/promote_service.rb
+14
-14
app/services/labels/transfer_service.rb
app/services/labels/transfer_service.rb
+10
-10
app/services/members/authorized_destroy_service.rb
app/services/members/authorized_destroy_service.rb
+15
-15
app/services/merge_requests/conflicts/resolve_service.rb
app/services/merge_requests/conflicts/resolve_service.rb
+4
-4
app/services/merge_requests/merge_service.rb
app/services/merge_requests/merge_service.rb
+2
-2
app/services/merge_requests/refresh_service.rb
app/services/merge_requests/refresh_service.rb
+5
-5
app/services/notes/quick_actions_service.rb
app/services/notes/quick_actions_service.rb
+2
-2
app/services/tags/create_service.rb
app/services/tags/create_service.rb
+2
-2
app/workers/merge_worker.rb
app/workers/merge_worker.rb
+2
-2
app/workers/process_commit_worker.rb
app/workers/process_commit_worker.rb
+4
-4
app/workers/project_cache_worker.rb
app/workers/project_cache_worker.rb
+3
-3
app/workers/propagate_service_template_worker.rb
app/workers/propagate_service_template_worker.rb
+3
-3
app/workers/prune_old_events_worker.rb
app/workers/prune_old_events_worker.rb
+4
-4
app/workers/repository_check/batch_worker.rb
app/workers/repository_check/batch_worker.rb
+4
-4
app/workers/update_user_activity_worker.rb
app/workers/update_user_activity_worker.rb
+2
-2
config/initializers/8_metrics.rb
config/initializers/8_metrics.rb
+2
-2
db/migrate/20161124141322_migrate_process_commit_worker_jobs.rb
...rate/20161124141322_migrate_process_commit_worker_jobs.rb
+3
-3
db/migrate/20161207231620_fixup_environment_name_uniqueness.rb
...grate/20161207231620_fixup_environment_name_uniqueness.rb
+16
-16
db/migrate/20161207231626_add_environment_slug.rb
db/migrate/20161207231626_add_environment_slug.rb
+4
-4
db/migrate/20170316163800_rename_system_namespaces.rb
db/migrate/20170316163800_rename_system_namespaces.rb
+5
-5
db/migrate/20170503140202_turn_nested_groups_into_regular_groups_for_mysql.rb
...40202_turn_nested_groups_into_regular_groups_for_mysql.rb
+7
-7
db/post_migrate/20161109150329_fix_project_records_with_invalid_visibility.rb
...1109150329_fix_project_records_with_invalid_visibility.rb
+11
-11
db/post_migrate/20161221153951_rename_reserved_project_names.rb
...t_migrate/20161221153951_rename_reserved_project_names.rb
+6
-6
db/post_migrate/20170104150317_requeue_pending_delete_projects.rb
...migrate/20170104150317_requeue_pending_delete_projects.rb
+6
-6
db/post_migrate/20170106142508_fill_authorized_projects.rb
db/post_migrate/20170106142508_fill_authorized_projects.rb
+2
-2
db/post_migrate/20170313133418_rename_more_reserved_project_names.rb
...rate/20170313133418_rename_more_reserved_project_names.rb
+6
-6
db/post_migrate/20170324160416_migrate_user_activities_to_users_last_activity_on.rb
...0416_migrate_user_activities_to_users_last_activity_on.rb
+5
-5
db/post_migrate/20170502101023_cleanup_namespaceless_pending_delete_projects.rb
...02101023_cleanup_namespaceless_pending_delete_projects.rb
+6
-6
db/post_migrate/20170508170547_add_head_pipeline_for_each_merge_request.rb
...0170508170547_add_head_pipeline_for_each_merge_request.rb
+5
-5
lib/api/access_requests.rb
lib/api/access_requests.rb
+2
-2
lib/api/branches.rb
lib/api/branches.rb
+4
-4
lib/api/entities.rb
lib/api/entities.rb
+3
-3
lib/api/notes.rb
lib/api/notes.rb
+2
-2
lib/api/tags.rb
lib/api/tags.rb
+8
-8
lib/api/users.rb
lib/api/users.rb
+13
-13
lib/api/v3/branches.rb
lib/api/v3/branches.rb
+4
-4
lib/api/v3/entities.rb
lib/api/v3/entities.rb
+3
-3
lib/api/v3/notes.rb
lib/api/v3/notes.rb
+2
-2
lib/api/v3/tags.rb
lib/api/v3/tags.rb
+2
-2
lib/api/v3/users.rb
lib/api/v3/users.rb
+11
-11
lib/banzai/reference_extractor.rb
lib/banzai/reference_extractor.rb
+2
-2
lib/banzai/reference_parser/issue_parser.rb
lib/banzai/reference_parser/issue_parser.rb
+2
-2
lib/banzai/reference_parser/user_parser.rb
lib/banzai/reference_parser/user_parser.rb
+2
-2
lib/ci/charts.rb
lib/ci/charts.rb
+13
-13
lib/gitlab/background_migration.rb
lib/gitlab/background_migration.rb
+2
-2
lib/gitlab/cache/ci/project_pipeline_status.rb
lib/gitlab/cache/ci/project_pipeline_status.rb
+2
-2
lib/gitlab/ci/pipeline_duration.rb
lib/gitlab/ci/pipeline_duration.rb
+2
-2
lib/gitlab/conflict/file_collection.rb
lib/gitlab/conflict/file_collection.rb
+3
-3
lib/gitlab/contributions_calendar.rb
lib/gitlab/contributions_calendar.rb
+23
-23
lib/gitlab/cycle_analytics/base_query.rb
lib/gitlab/cycle_analytics/base_query.rb
+9
-9
lib/gitlab/database/median.rb
lib/gitlab/database/median.rb
+11
-11
lib/gitlab/database/migration_helpers.rb
lib/gitlab/database/migration_helpers.rb
+15
-15
lib/gitlab/database/rename_reserved_paths_migration/v1/rename_base.rb
...atabase/rename_reserved_paths_migration/v1/rename_base.rb
+2
-2
lib/gitlab/database/rename_reserved_paths_migration/v1/rename_namespaces.rb
...e/rename_reserved_paths_migration/v1/rename_namespaces.rb
+7
-7
lib/gitlab/downtime_check.rb
lib/gitlab/downtime_check.rb
+2
-2
lib/gitlab/group_hierarchy.rb
lib/gitlab/group_hierarchy.rb
+13
-13
lib/gitlab/highlight.rb
lib/gitlab/highlight.rb
+2
-2
lib/gitlab/ldap/user.rb
lib/gitlab/ldap/user.rb
+3
-3
lib/gitlab/metrics/influx_db.rb
lib/gitlab/metrics/influx_db.rb
+2
-2
lib/gitlab/metrics/system.rb
lib/gitlab/metrics/system.rb
+4
-4
lib/gitlab/other_markup.rb
lib/gitlab/other_markup.rb
+2
-2
lib/gitlab/performance_bar/peek_query_tracker.rb
lib/gitlab/performance_bar/peek_query_tracker.rb
+2
-2
lib/gitlab/project_authorizations/with_nested_groups.rb
lib/gitlab/project_authorizations/with_nested_groups.rb
+34
-34
lib/gitlab/project_authorizations/without_nested_groups.rb
lib/gitlab/project_authorizations/without_nested_groups.rb
+3
-3
lib/gitlab/shell.rb
lib/gitlab/shell.rb
+2
-2
lib/gitlab/sherlock/line_profiler.rb
lib/gitlab/sherlock/line_profiler.rb
+2
-2
lib/gitlab/sherlock/query.rb
lib/gitlab/sherlock/query.rb
+4
-4
lib/gitlab/sql/recursive_cte.rb
lib/gitlab/sql/recursive_cte.rb
+4
-4
spec/controllers/admin/users_controller_spec.rb
spec/controllers/admin/users_controller_spec.rb
+2
-2
spec/controllers/import/bitbucket_controller_spec.rb
spec/controllers/import/bitbucket_controller_spec.rb
+41
-41
spec/controllers/import/github_controller_spec.rb
spec/controllers/import/github_controller_spec.rb
+4
-4
spec/controllers/import/gitlab_controller_spec.rb
spec/controllers/import/gitlab_controller_spec.rb
+41
-41
spec/controllers/projects/blob_controller_spec.rb
spec/controllers/projects/blob_controller_spec.rb
+2
-2
spec/controllers/projects/branches_controller_spec.rb
spec/controllers/projects/branches_controller_spec.rb
+6
-6
spec/controllers/projects/commit_controller_spec.rb
spec/controllers/projects/commit_controller_spec.rb
+2
-2
spec/controllers/projects/environments_controller_spec.rb
spec/controllers/projects/environments_controller_spec.rb
+8
-8
spec/controllers/projects/issues_controller_spec.rb
spec/controllers/projects/issues_controller_spec.rb
+6
-6
spec/controllers/projects/mattermosts_controller_spec.rb
spec/controllers/projects/mattermosts_controller_spec.rb
+2
-2
spec/controllers/projects/merge_requests_controller_spec.rb
spec/controllers/projects/merge_requests_controller_spec.rb
+13
-13
spec/controllers/projects/raw_controller_spec.rb
spec/controllers/projects/raw_controller_spec.rb
+4
-4
spec/controllers/projects/services_controller_spec.rb
spec/controllers/projects/services_controller_spec.rb
+2
-2
spec/controllers/projects/snippets_controller_spec.rb
spec/controllers/projects/snippets_controller_spec.rb
+16
-16
spec/controllers/projects/tree_controller_spec.rb
spec/controllers/projects/tree_controller_spec.rb
+6
-6
spec/controllers/sent_notifications_controller_spec.rb
spec/controllers/sent_notifications_controller_spec.rb
+4
-4
spec/controllers/sessions_controller_spec.rb
spec/controllers/sessions_controller_spec.rb
+8
-8
spec/controllers/snippets_controller_spec.rb
spec/controllers/snippets_controller_spec.rb
+16
-16
spec/factories/projects.rb
spec/factories/projects.rb
+2
-2
spec/features/admin/admin_projects_spec.rb
spec/features/admin/admin_projects_spec.rb
+2
-2
spec/features/admin/admin_users_spec.rb
spec/features/admin/admin_users_spec.rb
+4
-4
spec/features/atom/dashboard_spec.rb
spec/features/atom/dashboard_spec.rb
+2
-2
spec/features/atom/issues_spec.rb
spec/features/atom/issues_spec.rb
+6
-6
spec/features/atom/users_spec.rb
spec/features/atom/users_spec.rb
+2
-2
spec/features/gitlab_flavored_markdown_spec.rb
spec/features/gitlab_flavored_markdown_spec.rb
+2
-2
spec/features/login_spec.rb
spec/features/login_spec.rb
+2
-2
spec/features/markdown_spec.rb
spec/features/markdown_spec.rb
+8
-8
spec/features/merge_requests/user_posts_notes_spec.rb
spec/features/merge_requests/user_posts_notes_spec.rb
+4
-4
spec/features/snippets/notes_on_personal_snippets_spec.rb
spec/features/snippets/notes_on_personal_snippets_spec.rb
+2
-2
spec/helpers/application_helper_spec.rb
spec/helpers/application_helper_spec.rb
+24
-24
spec/helpers/broadcast_messages_helper_spec.rb
spec/helpers/broadcast_messages_helper_spec.rb
+2
-2
spec/helpers/commits_helper_spec.rb
spec/helpers/commits_helper_spec.rb
+4
-4
spec/helpers/form_helper_spec.rb
spec/helpers/form_helper_spec.rb
+6
-6
spec/helpers/groups_helper_spec.rb
spec/helpers/groups_helper_spec.rb
+2
-2
spec/helpers/import_helper_spec.rb
spec/helpers/import_helper_spec.rb
+10
-10
spec/helpers/issuables_helper_spec.rb
spec/helpers/issuables_helper_spec.rb
+20
-20
spec/helpers/issues_helper_spec.rb
spec/helpers/issues_helper_spec.rb
+2
-2
spec/helpers/labels_helper_spec.rb
spec/helpers/labels_helper_spec.rb
+2
-2
spec/helpers/markup_helper_spec.rb
spec/helpers/markup_helper_spec.rb
+8
-8
spec/helpers/merge_requests_helper_spec.rb
spec/helpers/merge_requests_helper_spec.rb
+2
-2
spec/helpers/page_layout_helper_spec.rb
spec/helpers/page_layout_helper_spec.rb
+2
-2
spec/helpers/preferences_helper_spec.rb
spec/helpers/preferences_helper_spec.rb
+8
-8
spec/lib/banzai/cross_project_reference_spec.rb
spec/lib/banzai/cross_project_reference_spec.rb
+2
-2
spec/lib/banzai/filter/abstract_reference_filter_spec.rb
spec/lib/banzai/filter/abstract_reference_filter_spec.rb
+14
-14
spec/lib/banzai/filter/commit_range_reference_filter_spec.rb
spec/lib/banzai/filter/commit_range_reference_filter_spec.rb
+18
-18
spec/lib/banzai/filter/commit_reference_filter_spec.rb
spec/lib/banzai/filter/commit_reference_filter_spec.rb
+4
-4
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/issue_reference_filter_spec.rb
spec/lib/banzai/filter/issue_reference_filter_spec.rb
+35
-35
spec/lib/banzai/filter/label_reference_filter_spec.rb
spec/lib/banzai/filter/label_reference_filter_spec.rb
+38
-38
spec/lib/banzai/filter/merge_request_reference_filter_spec.rb
.../lib/banzai/filter/merge_request_reference_filter_spec.rb
+10
-10
spec/lib/banzai/filter/milestone_reference_filter_spec.rb
spec/lib/banzai/filter/milestone_reference_filter_spec.rb
+34
-34
spec/lib/banzai/filter/redactor_filter_spec.rb
spec/lib/banzai/filter/redactor_filter_spec.rb
+3
-3
spec/lib/banzai/filter/reference_filter_spec.rb
spec/lib/banzai/filter/reference_filter_spec.rb
+2
-2
spec/lib/banzai/filter/relative_link_filter_spec.rb
spec/lib/banzai/filter/relative_link_filter_spec.rb
+24
-24
spec/lib/banzai/filter/sanitization_filter_spec.rb
spec/lib/banzai/filter/sanitization_filter_spec.rb
+2
-2
spec/lib/banzai/filter/snippet_reference_filter_spec.rb
spec/lib/banzai/filter/snippet_reference_filter_spec.rb
+10
-10
spec/lib/banzai/filter/upload_link_filter_spec.rb
spec/lib/banzai/filter/upload_link_filter_spec.rb
+12
-12
spec/lib/banzai/note_renderer_spec.rb
spec/lib/banzai/note_renderer_spec.rb
+6
-6
spec/lib/banzai/redactor_spec.rb
spec/lib/banzai/redactor_spec.rb
+11
-11
spec/lib/banzai/reference_parser/base_parser_spec.rb
spec/lib/banzai/reference_parser/base_parser_spec.rb
+70
-70
spec/lib/banzai/reference_parser/commit_parser_spec.rb
spec/lib/banzai/reference_parser/commit_parser_spec.rb
+16
-16
spec/lib/banzai/reference_parser/commit_range_parser_spec.rb
spec/lib/banzai/reference_parser/commit_range_parser_spec.rb
+12
-12
spec/lib/banzai/reference_parser/issue_parser_spec.rb
spec/lib/banzai/reference_parser/issue_parser_spec.rb
+6
-6
spec/lib/banzai/reference_parser/user_parser_spec.rb
spec/lib/banzai/reference_parser/user_parser_spec.rb
+12
-12
spec/lib/container_registry/blob_spec.rb
spec/lib/container_registry/blob_spec.rb
+5
-5
spec/lib/container_registry/client_spec.rb
spec/lib/container_registry/client_spec.rb
+11
-11
spec/lib/container_registry/tag_spec.rb
spec/lib/container_registry/tag_spec.rb
+14
-14
spec/lib/extracts_path_spec.rb
spec/lib/extracts_path_spec.rb
+2
-2
spec/lib/feature_spec.rb
spec/lib/feature_spec.rb
+4
-4
spec/lib/gitlab/background_migration_spec.rb
spec/lib/gitlab/background_migration_spec.rb
+9
-9
spec/lib/gitlab/bitbucket_import/importer_spec.rb
spec/lib/gitlab/bitbucket_import/importer_spec.rb
+3
-5
spec/lib/gitlab/cache/ci/project_pipeline_status_spec.rb
spec/lib/gitlab/cache/ci/project_pipeline_status_spec.rb
+8
-8
spec/lib/gitlab/ci/build/artifacts/metadata_spec.rb
spec/lib/gitlab/ci/build/artifacts/metadata_spec.rb
+6
-6
spec/lib/gitlab/closing_issue_extractor_spec.rb
spec/lib/gitlab/closing_issue_extractor_spec.rb
+16
-16
spec/lib/gitlab/conflict/file_spec.rb
spec/lib/gitlab/conflict/file_spec.rb
+12
-12
spec/lib/gitlab/conflict/parser_spec.rb
spec/lib/gitlab/conflict/parser_spec.rb
+32
-32
spec/lib/gitlab/data_builder/push_spec.rb
spec/lib/gitlab/data_builder/push_spec.rb
+2
-2
spec/lib/gitlab/database/migration_helpers_spec.rb
spec/lib/gitlab/database/migration_helpers_spec.rb
+106
-106
spec/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_namespaces_spec.rb
...ame_reserved_paths_migration/v1/rename_namespaces_spec.rb
+17
-17
spec/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_projects_spec.rb
...ename_reserved_paths_migration/v1/rename_projects_spec.rb
+15
-15
spec/lib/gitlab/database/rename_reserved_paths_migration/v1_spec.rb
...itlab/database/rename_reserved_paths_migration/v1_spec.rb
+13
-13
spec/lib/gitlab/database_spec.rb
spec/lib/gitlab/database_spec.rb
+4
-4
spec/lib/gitlab/downtime_check_spec.rb
spec/lib/gitlab/downtime_check_spec.rb
+16
-16
spec/lib/gitlab/email/reply_parser_spec.rb
spec/lib/gitlab/email/reply_parser_spec.rb
+18
-18
spec/lib/gitlab/etag_caching/middleware_spec.rb
spec/lib/gitlab/etag_caching/middleware_spec.rb
+2
-2
spec/lib/gitlab/file_detector_spec.rb
spec/lib/gitlab/file_detector_spec.rb
+4
-4
spec/lib/gitlab/git/attributes_spec.rb
spec/lib/gitlab/git/attributes_spec.rb
+22
-22
spec/lib/gitlab/git/blob_spec.rb
spec/lib/gitlab/git/blob_spec.rb
+3
-3
spec/lib/gitlab/git/branch_spec.rb
spec/lib/gitlab/git/branch_spec.rb
+2
-2
spec/lib/gitlab/git/diff_collection_spec.rb
spec/lib/gitlab/git/diff_collection_spec.rb
+8
-8
spec/lib/gitlab/git/diff_spec.rb
spec/lib/gitlab/git/diff_spec.rb
+4
-4
spec/lib/gitlab/git/repository_spec.rb
spec/lib/gitlab/git/repository_spec.rb
+20
-20
spec/lib/gitlab/gitaly_client/notifications_spec.rb
spec/lib/gitlab/gitaly_client/notifications_spec.rb
+2
-2
spec/lib/gitlab/gitaly_client/ref_spec.rb
spec/lib/gitlab/gitaly_client/ref_spec.rb
+20
-20
spec/lib/gitlab/gitlab_import/importer_spec.rb
spec/lib/gitlab/gitlab_import/importer_spec.rb
+2
-2
spec/lib/gitlab/highlight_spec.rb
spec/lib/gitlab/highlight_spec.rb
+2
-2
spec/lib/gitlab/identifier_spec.rb
spec/lib/gitlab/identifier_spec.rb
+6
-6
spec/lib/gitlab/job_waiter_spec.rb
spec/lib/gitlab/job_waiter_spec.rb
+5
-5
spec/lib/gitlab/ldap/authentication_spec.rb
spec/lib/gitlab/ldap/authentication_spec.rb
+6
-6
spec/lib/gitlab/ldap/user_spec.rb
spec/lib/gitlab/ldap/user_spec.rb
+2
-2
spec/lib/gitlab/metrics/instrumentation_spec.rb
spec/lib/gitlab/metrics/instrumentation_spec.rb
+16
-16
spec/lib/gitlab/metrics/rack_middleware_spec.rb
spec/lib/gitlab/metrics/rack_middleware_spec.rb
+6
-6
spec/lib/gitlab/metrics/sampler_spec.rb
spec/lib/gitlab/metrics/sampler_spec.rb
+27
-27
spec/lib/gitlab/metrics/sidekiq_middleware_spec.rb
spec/lib/gitlab/metrics/sidekiq_middleware_spec.rb
+18
-18
spec/lib/gitlab/metrics/subscribers/action_view_spec.rb
spec/lib/gitlab/metrics/subscribers/action_view_spec.rb
+4
-4
spec/lib/gitlab/metrics/subscribers/active_record_spec.rb
spec/lib/gitlab/metrics/subscribers/active_record_spec.rb
+9
-9
spec/lib/gitlab/metrics/subscribers/rails_cache_spec.rb
spec/lib/gitlab/metrics/subscribers/rails_cache_spec.rb
+40
-40
spec/lib/gitlab/metrics/transaction_spec.rb
spec/lib/gitlab/metrics/transaction_spec.rb
+14
-14
spec/lib/gitlab/metrics_spec.rb
spec/lib/gitlab/metrics_spec.rb
+24
-24
spec/lib/gitlab/project_authorizations_spec.rb
spec/lib/gitlab/project_authorizations_spec.rb
+2
-2
spec/lib/gitlab/route_map_spec.rb
spec/lib/gitlab/route_map_spec.rb
+12
-12
spec/lib/gitlab/sherlock/file_sample_spec.rb
spec/lib/gitlab/sherlock/file_sample_spec.rb
+2
-2
spec/lib/gitlab/sherlock/line_profiler_spec.rb
spec/lib/gitlab/sherlock/line_profiler_spec.rb
+3
-3
spec/lib/gitlab/sherlock/middleware_spec.rb
spec/lib/gitlab/sherlock/middleware_spec.rb
+2
-2
spec/lib/gitlab/sherlock/query_spec.rb
spec/lib/gitlab/sherlock/query_spec.rb
+2
-2
spec/lib/gitlab/sherlock/transaction_spec.rb
spec/lib/gitlab/sherlock/transaction_spec.rb
+14
-14
spec/lib/gitlab/sidekiq_status/client_middleware_spec.rb
spec/lib/gitlab/sidekiq_status/client_middleware_spec.rb
+2
-2
spec/lib/gitlab/sidekiq_status/server_middleware_spec.rb
spec/lib/gitlab/sidekiq_status/server_middleware_spec.rb
+2
-2
spec/lib/gitlab/url_builder_spec.rb
spec/lib/gitlab/url_builder_spec.rb
+2
-2
spec/lib/gitlab/view/presenter/delegated_spec.rb
spec/lib/gitlab/view/presenter/delegated_spec.rb
+2
-2
spec/lib/gitlab/visibility_level_spec.rb
spec/lib/gitlab/visibility_level_spec.rb
+11
-11
spec/lib/mattermost/command_spec.rb
spec/lib/mattermost/command_spec.rb
+8
-8
spec/lib/mattermost/session_spec.rb
spec/lib/mattermost/session_spec.rb
+7
-7
spec/lib/mattermost/team_spec.rb
spec/lib/mattermost/team_spec.rb
+6
-6
spec/mailers/abuse_report_mailer_spec.rb
spec/mailers/abuse_report_mailer_spec.rb
+2
-2
spec/migrations/migrate_process_commit_worker_jobs_spec.rb
spec/migrations/migrate_process_commit_worker_jobs_spec.rb
+27
-27
spec/migrations/turn_nested_groups_into_regular_groups_for_mysql_spec.rb
.../turn_nested_groups_into_regular_groups_for_mysql_spec.rb
+9
-9
spec/models/ability_spec.rb
spec/models/ability_spec.rb
+28
-28
spec/models/abuse_report_spec.rb
spec/models/abuse_report_spec.rb
+2
-2
spec/models/ci/build_spec.rb
spec/models/ci/build_spec.rb
+2
-2
spec/models/ci/pipeline_schedule_spec.rb
spec/models/ci/pipeline_schedule_spec.rb
+6
-6
spec/models/ci/pipeline_spec.rb
spec/models/ci/pipeline_spec.rb
+8
-8
spec/models/ci/variable_spec.rb
spec/models/ci/variable_spec.rb
+2
-2
spec/models/commit_range_spec.rb
spec/models/commit_range_spec.rb
+3
-3
spec/models/concerns/case_sensitivity_spec.rb
spec/models/concerns/case_sensitivity_spec.rb
+74
-74
spec/models/concerns/has_status_spec.rb
spec/models/concerns/has_status_spec.rb
+2
-2
spec/models/concerns/issuable_spec.rb
spec/models/concerns/issuable_spec.rb
+14
-14
spec/models/concerns/resolvable_discussion_spec.rb
spec/models/concerns/resolvable_discussion_spec.rb
+6
-6
spec/models/event_spec.rb
spec/models/event_spec.rb
+2
-2
spec/models/group_spec.rb
spec/models/group_spec.rb
+2
-2
spec/models/issue_collection_spec.rb
spec/models/issue_collection_spec.rb
+2
-2
spec/models/issue_spec.rb
spec/models/issue_spec.rb
+10
-10
spec/models/key_spec.rb
spec/models/key_spec.rb
+4
-4
spec/models/label_spec.rb
spec/models/label_spec.rb
+2
-2
spec/models/member_spec.rb
spec/models/member_spec.rb
+4
-4
spec/models/members/group_member_spec.rb
spec/models/members/group_member_spec.rb
+4
-4
spec/models/merge_request_spec.rb
spec/models/merge_request_spec.rb
+25
-25
spec/models/milestone_spec.rb
spec/models/milestone_spec.rb
+4
-4
spec/models/namespace_spec.rb
spec/models/namespace_spec.rb
+2
-2
spec/models/note_spec.rb
spec/models/note_spec.rb
+8
-8
spec/models/project_authorization_spec.rb
spec/models/project_authorization_spec.rb
+2
-2
spec/models/project_services/mattermost_slash_commands_service_spec.rb
...roject_services/mattermost_slash_commands_service_spec.rb
+12
-12
spec/models/project_spec.rb
spec/models/project_spec.rb
+32
-32
spec/models/project_team_spec.rb
spec/models/project_team_spec.rb
+2
-2
spec/models/project_wiki_spec.rb
spec/models/project_wiki_spec.rb
+12
-12
spec/models/repository_spec.rb
spec/models/repository_spec.rb
+83
-83
spec/models/upload_spec.rb
spec/models/upload_spec.rb
+2
-2
spec/models/user_spec.rb
spec/models/user_spec.rb
+4
-4
spec/models/wiki_page_spec.rb
spec/models/wiki_page_spec.rb
+2
-2
spec/policies/project_policy_spec.rb
spec/policies/project_policy_spec.rb
+2
-2
spec/presenters/ci/build_presenter_spec.rb
spec/presenters/ci/build_presenter_spec.rb
+2
-2
spec/requests/api/files_spec.rb
spec/requests/api/files_spec.rb
+2
-2
spec/requests/api/groups_spec.rb
spec/requests/api/groups_spec.rb
+2
-2
spec/requests/api/merge_requests_spec.rb
spec/requests/api/merge_requests_spec.rb
+2
-2
spec/requests/api/notes_spec.rb
spec/requests/api/notes_spec.rb
+2
-2
spec/requests/api/project_snippets_spec.rb
spec/requests/api/project_snippets_spec.rb
+16
-16
spec/requests/api/projects_spec.rb
spec/requests/api/projects_spec.rb
+18
-18
spec/requests/api/runner_spec.rb
spec/requests/api/runner_spec.rb
+2
-2
spec/requests/api/snippets_spec.rb
spec/requests/api/snippets_spec.rb
+16
-16
spec/requests/api/users_spec.rb
spec/requests/api/users_spec.rb
+16
-16
spec/requests/api/v3/files_spec.rb
spec/requests/api/v3/files_spec.rb
+2
-2
spec/requests/api/v3/groups_spec.rb
spec/requests/api/v3/groups_spec.rb
+2
-2
spec/requests/api/v3/merge_requests_spec.rb
spec/requests/api/v3/merge_requests_spec.rb
+2
-2
spec/requests/api/v3/notes_spec.rb
spec/requests/api/v3/notes_spec.rb
+2
-2
spec/requests/api/v3/project_snippets_spec.rb
spec/requests/api/v3/project_snippets_spec.rb
+16
-16
spec/requests/api/v3/projects_spec.rb
spec/requests/api/v3/projects_spec.rb
+16
-16
spec/requests/api/v3/snippets_spec.rb
spec/requests/api/v3/snippets_spec.rb
+6
-6
spec/requests/ci/api/builds_spec.rb
spec/requests/ci/api/builds_spec.rb
+4
-4
spec/requests/git_http_spec.rb
spec/requests/git_http_spec.rb
+2
-2
spec/rubocop/cop/migration/update_column_in_batches_spec.rb
spec/rubocop/cop/migration/update_column_in_batches_spec.rb
+2
-2
spec/services/files/update_service_spec.rb
spec/services/files/update_service_spec.rb
+2
-2
spec/services/git_push_service_spec.rb
spec/services/git_push_service_spec.rb
+23
-23
spec/services/issues/close_service_spec.rb
spec/services/issues/close_service_spec.rb
+8
-8
spec/services/labels/promote_service_spec.rb
spec/services/labels/promote_service_spec.rb
+3
-3
spec/services/members/destroy_service_spec.rb
spec/services/members/destroy_service_spec.rb
+2
-2
spec/services/merge_requests/close_service_spec.rb
spec/services/merge_requests/close_service_spec.rb
+2
-2
spec/services/merge_requests/conflicts/resolve_service_spec.rb
...services/merge_requests/conflicts/resolve_service_spec.rb
+14
-15
spec/services/merge_requests/create_service_spec.rb
spec/services/merge_requests/create_service_spec.rb
+3
-3
spec/services/merge_requests/merge_service_spec.rb
spec/services/merge_requests/merge_service_spec.rb
+3
-3
spec/services/merge_requests/refresh_service_spec.rb
spec/services/merge_requests/refresh_service_spec.rb
+8
-8
spec/services/merge_requests/reopen_service_spec.rb
spec/services/merge_requests/reopen_service_spec.rb
+2
-2
spec/services/merge_requests/update_service_spec.rb
spec/services/merge_requests/update_service_spec.rb
+4
-4
spec/services/projects/housekeeping_service_spec.rb
spec/services/projects/housekeeping_service_spec.rb
+6
-6
spec/services/projects/import_service_spec.rb
spec/services/projects/import_service_spec.rb
+4
-4
spec/services/projects/propagate_service_template_spec.rb
spec/services/projects/propagate_service_template_spec.rb
+6
-6
spec/services/projects/transfer_service_spec.rb
spec/services/projects/transfer_service_spec.rb
+7
-7
spec/services/projects/unlink_fork_service_spec.rb
spec/services/projects/unlink_fork_service_spec.rb
+3
-3
spec/services/submit_usage_ping_service_spec.rb
spec/services/submit_usage_ping_service_spec.rb
+2
-2
spec/services/system_note_service_spec.rb
spec/services/system_note_service_spec.rb
+26
-26
spec/services/tags/create_service_spec.rb
spec/services/tags/create_service_spec.rb
+6
-6
spec/services/user_project_access_changed_service_spec.rb
spec/services/user_project_access_changed_service_spec.rb
+2
-2
spec/services/users/activity_service_spec.rb
spec/services/users/activity_service_spec.rb
+3
-3
spec/services/users/refresh_authorized_projects_service_spec.rb
...ervices/users/refresh_authorized_projects_service_spec.rb
+12
-12
spec/support/controllers/githubish_import_controller_shared_examples.rb
...ontrollers/githubish_import_controller_shared_examples.rb
+50
-50
spec/support/mentionable_shared_examples.rb
spec/support/mentionable_shared_examples.rb
+6
-6
spec/support/reactive_caching_helpers.rb
spec/support/reactive_caching_helpers.rb
+3
-3
spec/support/services_shared_context.rb
spec/support/services_shared_context.rb
+3
-3
spec/support/slack_mattermost_notifications_shared_examples.rb
...support/slack_mattermost_notifications_shared_examples.rb
+21
-21
spec/support/stub_configuration.rb
spec/support/stub_configuration.rb
+2
-2
spec/support/stub_gitlab_calls.rb
spec/support/stub_gitlab_calls.rb
+19
-19
spec/support/test_env.rb
spec/support/test_env.rb
+4
-4
spec/support/update_invalid_issuable.rb
spec/support/update_invalid_issuable.rb
+2
-2
spec/support/user_activities_helpers.rb
spec/support/user_activities_helpers.rb
+2
-2
spec/tasks/gitlab/backup_rake_spec.rb
spec/tasks/gitlab/backup_rake_spec.rb
+10
-10
spec/tasks/gitlab/gitaly_rake_spec.rb
spec/tasks/gitlab/gitaly_rake_spec.rb
+6
-6
spec/tasks/gitlab/task_helpers_spec.rb
spec/tasks/gitlab/task_helpers_spec.rb
+8
-8
spec/tasks/gitlab/workhorse_rake_spec.rb
spec/tasks/gitlab/workhorse_rake_spec.rb
+4
-4
spec/views/devise/shared/_signin_box.html.haml_spec.rb
spec/views/devise/shared/_signin_box.html.haml_spec.rb
+2
-2
spec/workers/background_migration_worker_spec.rb
spec/workers/background_migration_worker_spec.rb
+3
-3
spec/workers/delete_user_worker_spec.rb
spec/workers/delete_user_worker_spec.rb
+4
-4
spec/workers/every_sidekiq_worker_spec.rb
spec/workers/every_sidekiq_worker_spec.rb
+5
-5
spec/workers/expire_pipeline_cache_worker_spec.rb
spec/workers/expire_pipeline_cache_worker_spec.rb
+2
-2
spec/workers/git_garbage_collect_worker_spec.rb
spec/workers/git_garbage_collect_worker_spec.rb
+2
-2
spec/workers/new_note_worker_spec.rb
spec/workers/new_note_worker_spec.rb
+2
-2
spec/workers/post_receive_spec.rb
spec/workers/post_receive_spec.rb
+3
-3
spec/workers/process_commit_worker_spec.rb
spec/workers/process_commit_worker_spec.rb
+12
-12
spec/workers/project_cache_worker_spec.rb
spec/workers/project_cache_worker_spec.rb
+14
-14
spec/workers/propagate_service_template_worker_spec.rb
spec/workers/propagate_service_template_worker_spec.rb
+2
-2
spec/workers/repository_fork_worker_spec.rb
spec/workers/repository_fork_worker_spec.rb
+4
-4
spec/workers/repository_import_worker_spec.rb
spec/workers/repository_import_worker_spec.rb
+2
-2
No files found.
.rubocop.yml
View file @
0430b764
...
...
@@ -164,6 +164,11 @@ Style/DefWithParentheses:
Style/Documentation
:
Enabled
:
false
# Multi-line method chaining should be done with leading dots.
Style/DotPosition
:
Enabled
:
true
EnforcedStyle
:
leading
# This cop checks for uses of double negation (!!) to convert something
# to a boolean value. As this is both cryptic and usually redundant, it
# should be avoided.
...
...
.rubocop_todo.yml
View file @
0430b764
...
...
@@ -88,13 +88,6 @@ Security/YAMLLoad:
Style/BarePercentLiterals
:
Enabled
:
false
# Offense count: 1403
# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyle, SupportedStyles.
# SupportedStyles: leading, trailing
Style/DotPosition
:
Enabled
:
false
# Offense count: 5
# Cop supports --auto-correct.
Style/EachWithObject
:
...
...
app/controllers/concerns/creates_commit.rb
View file @
0430b764
...
...
@@ -97,8 +97,8 @@ def existing_merge_request_path
def
merge_request_exists?
return
@merge_request
if
defined?
(
@merge_request
)
@merge_request
=
MergeRequestsFinder
.
new
(
current_user
,
project_id:
@project
.
id
).
execute
.
opened
.
find_by
(
source_project_id:
@project_to_commit_into
,
source_branch:
@branch_name
,
target_branch:
@start_branch
)
@merge_request
=
MergeRequestsFinder
.
new
(
current_user
,
project_id:
@project
.
id
).
execute
.
opened
.
find_by
(
source_project_id:
@project_to_commit_into
,
source_branch:
@branch_name
,
target_branch:
@start_branch
)
end
def
different_project?
...
...
app/controllers/concerns/membership_actions.rb
View file @
0430b764
...
...
@@ -15,8 +15,8 @@ def create
end
def
destroy
Members
::
DestroyService
.
new
(
membershipable
,
current_user
,
params
)
.
execute
(
:all
)
Members
::
DestroyService
.
new
(
membershipable
,
current_user
,
params
)
.
execute
(
:all
)
respond_to
do
|
format
|
format
.
html
do
...
...
@@ -42,8 +42,8 @@ def approve_access_request
end
def
leave
member
=
Members
::
DestroyService
.
new
(
membershipable
,
current_user
,
user_id:
current_user
.
id
)
.
execute
(
:all
)
member
=
Members
::
DestroyService
.
new
(
membershipable
,
current_user
,
user_id:
current_user
.
id
)
.
execute
(
:all
)
notice
=
if
member
.
request?
...
...
app/controllers/dashboard/projects_controller.rb
View file @
0430b764
...
...
@@ -22,8 +22,8 @@ def index
end
def
starred
@projects
=
load_projects
(
params
.
merge
(
starred:
true
))
.
includes
(
:forked_from_project
,
:tags
).
page
(
params
[
:page
])
@projects
=
load_projects
(
params
.
merge
(
starred:
true
))
.
includes
(
:forked_from_project
,
:tags
).
page
(
params
[
:page
])
@groups
=
[]
...
...
@@ -45,8 +45,8 @@ def default_sorting
end
def
load_projects
(
finder_params
)
ProjectsFinder
.
new
(
params:
finder_params
,
current_user:
current_user
)
.
execute
.
includes
(
:route
,
namespace: :route
)
ProjectsFinder
.
new
(
params:
finder_params
,
current_user:
current_user
)
.
execute
.
includes
(
:route
,
namespace: :route
)
end
def
load_events
...
...
app/controllers/explore/projects_controller.rb
View file @
0430b764
...
...
@@ -49,7 +49,7 @@ def starred
private
def
load_projects
ProjectsFinder
.
new
(
current_user:
current_user
,
params:
params
)
.
execute
.
includes
(
:route
,
namespace: :route
)
ProjectsFinder
.
new
(
current_user:
current_user
,
params:
params
)
.
execute
.
includes
(
:route
,
namespace: :route
)
end
end
app/controllers/jwt_controller.rb
View file @
0430b764
...
...
@@ -11,8 +11,8 @@ def auth
service
=
SERVICES
[
params
[
:service
]]
return
head
:not_found
unless
service
result
=
service
.
new
(
@authentication_result
.
project
,
@authentication_result
.
actor
,
auth_params
)
.
execute
(
authentication_abilities:
@authentication_result
.
authentication_abilities
)
result
=
service
.
new
(
@authentication_result
.
project
,
@authentication_result
.
actor
,
auth_params
)
.
execute
(
authentication_abilities:
@authentication_result
.
authentication_abilities
)
render
json:
result
,
status:
result
[
:http_status
]
end
...
...
app/controllers/omniauth_callbacks_controller.rb
View file @
0430b764
...
...
@@ -144,7 +144,7 @@ def oauth
end
def
log_audit_event
(
user
,
options
=
{})
AuditEventService
.
new
(
user
,
user
,
options
)
.
for_authentication
.
security_event
AuditEventService
.
new
(
user
,
user
,
options
)
.
for_authentication
.
security_event
end
end
app/controllers/profiles_controller.rb
View file @
0430b764
...
...
@@ -49,9 +49,9 @@ def reset_rss_token
end
def
audit_log
@events
=
AuditEvent
.
where
(
entity_type:
"User"
,
entity_id:
current_user
.
id
)
.
order
(
"created_at DESC"
).
page
(
params
[
:page
])
@events
=
AuditEvent
.
where
(
entity_type:
"User"
,
entity_id:
current_user
.
id
)
.
order
(
"created_at DESC"
)
.
page
(
params
[
:page
])
end
def
update_username
...
...
app/controllers/projects/blob_controller.rb
View file @
0430b764
...
...
@@ -187,7 +187,7 @@ def validate_diff_params
end
def
set_last_commit_sha
@last_commit_sha
=
Gitlab
::
Git
::
Commit
.
last_for_path
(
@repository
,
@ref
,
@path
).
sha
@last_commit_sha
=
Gitlab
::
Git
::
Commit
.
last_for_path
(
@repository
,
@ref
,
@path
).
sha
end
end
app/controllers/projects/branches_controller.rb
View file @
0430b764
...
...
@@ -37,8 +37,8 @@ def create
redirect_to_autodeploy
=
project
.
empty_repo?
&&
project
.
deployment_services
.
present?
result
=
CreateBranchService
.
new
(
project
,
current_user
)
.
execute
(
branch_name
,
ref
)
result
=
CreateBranchService
.
new
(
project
,
current_user
)
.
execute
(
branch_name
,
ref
)
if
params
[
:issue_iid
]
issue
=
IssuesFinder
.
new
(
current_user
,
project_id:
@project
.
id
).
find_by
(
iid:
params
[
:issue_iid
])
...
...
app/controllers/projects/commits_controller.rb
View file @
0430b764
...
...
@@ -18,11 +18,11 @@ def show
@repository
.
commits
(
@ref
,
path:
@path
,
limit:
@limit
,
offset:
@offset
)
end
@note_counts
=
project
.
notes
.
where
(
commit_id:
@commits
.
map
(
&
:id
))
.
group
(
:commit_id
).
count
@note_counts
=
project
.
notes
.
where
(
commit_id:
@commits
.
map
(
&
:id
))
.
group
(
:commit_id
).
count
@merge_request
=
MergeRequestsFinder
.
new
(
current_user
,
project_id:
@project
.
id
).
execute
.
opened
.
find_by
(
source_project:
@project
,
source_branch:
@ref
,
target_branch:
@repository
.
root_ref
)
@merge_request
=
MergeRequestsFinder
.
new
(
current_user
,
project_id:
@project
.
id
).
execute
.
opened
.
find_by
(
source_project:
@project
,
source_branch:
@ref
,
target_branch:
@repository
.
root_ref
)
respond_to
do
|
format
|
format
.
html
...
...
app/controllers/projects/compare_controller.rb
View file @
0430b764
...
...
@@ -61,7 +61,7 @@ def define_diff_vars
end
def
merge_request
@merge_request
||=
MergeRequestsFinder
.
new
(
current_user
,
project_id:
@project
.
id
).
execute
.
opened
.
find_by
(
source_project:
@project
,
source_branch:
@head_ref
,
target_branch:
@start_ref
)
@merge_request
||=
MergeRequestsFinder
.
new
(
current_user
,
project_id:
@project
.
id
).
execute
.
opened
.
find_by
(
source_project:
@project
,
source_branch:
@head_ref
,
target_branch:
@start_ref
)
end
end
app/controllers/projects/merge_requests_controller.rb
View file @
0430b764
...
...
@@ -143,8 +143,8 @@ def commits
# Get commits from repository
# or from cache if already merged
@commits
=
@merge_request
.
commits
@note_counts
=
Note
.
where
(
commit_id:
@commits
.
map
(
&
:id
))
.
group
(
:commit_id
).
count
@note_counts
=
Note
.
where
(
commit_id:
@commits
.
map
(
&
:id
))
.
group
(
:commit_id
).
count
render
json:
{
html:
view_to_html_string
(
'projects/merge_requests/show/_commits'
)
}
end
...
...
@@ -192,9 +192,9 @@ def resolve_conflicts
end
begin
MergeRequests
::
Conflicts
::
ResolveService
.
new
(
merge_request
).
execute
(
current_user
,
params
)
MergeRequests
::
Conflicts
::
ResolveService
.
new
(
merge_request
)
.
execute
(
current_user
,
params
)
flash
[
:notice
]
=
'All merge conflicts were resolved. The merge request can now be merged.'
...
...
@@ -562,8 +562,8 @@ def define_new_vars
@commits
=
@merge_request
.
compare_commits
.
reverse
@commit
=
@merge_request
.
diff_head_commit
@note_counts
=
Note
.
where
(
commit_id:
@commits
.
map
(
&
:id
))
.
group
(
:commit_id
).
count
@note_counts
=
Note
.
where
(
commit_id:
@commits
.
map
(
&
:id
))
.
group
(
:commit_id
).
count
@labels
=
LabelsFinder
.
new
(
current_user
,
project_id:
@project
.
id
).
execute
...
...
app/controllers/projects/settings/ci_cd_controller.rb
View file @
0430b764
...
...
@@ -14,8 +14,8 @@ def show
def
define_runners_variables
@project_runners
=
@project
.
runners
.
ordered
@assignable_runners
=
current_user
.
ci_authorized_runners
.
assignable_for
(
project
).
ordered
.
page
(
params
[
:page
]).
per
(
20
)
@assignable_runners
=
current_user
.
ci_authorized_runners
.
assignable_for
(
project
).
ordered
.
page
(
params
[
:page
]).
per
(
20
)
@shared_runners
=
Ci
::
Runner
.
shared
.
active
@shared_runners_count
=
@shared_runners
.
count
(
:all
)
end
...
...
app/controllers/projects/tags_controller.rb
View file @
0430b764
...
...
@@ -29,8 +29,8 @@ def show
end
def
create
result
=
Tags
::
CreateService
.
new
(
@project
,
current_user
)
.
execute
(
params
[
:tag_name
],
params
[
:ref
],
params
[
:message
],
params
[
:release_description
])
result
=
Tags
::
CreateService
.
new
(
@project
,
current_user
)
.
execute
(
params
[
:tag_name
],
params
[
:ref
],
params
[
:message
],
params
[
:release_description
])
if
result
[
:status
]
==
:success
@tag
=
result
[
:tag
]
...
...
app/controllers/sessions_controller.rb
View file @
0430b764
...
...
@@ -128,8 +128,8 @@ def valid_otp_attempt?(user)
end
def
log_audit_event
(
user
,
options
=
{})
AuditEventService
.
new
(
user
,
user
,
options
)
.
for_authentication
.
security_event
AuditEventService
.
new
(
user
,
user
,
options
)
.
for_authentication
.
security_event
end
def
log_user_activity
(
user
)
...
...
app/controllers/sherlock/application_controller.rb
View file @
0430b764
...
...
@@ -4,8 +4,8 @@ class ApplicationController < ::ApplicationController
def
find_transaction
if
params
[
:transaction_id
]
@transaction
=
Gitlab
::
Sherlock
.
collection
.
find_transaction
(
params
[
:transaction_id
])
@transaction
=
Gitlab
::
Sherlock
.
collection
.
find_transaction
(
params
[
:transaction_id
])
end
end
end
...
...
app/controllers/users_controller.rb
View file @
0430b764
...
...
@@ -106,11 +106,11 @@ def contributions_calendar
def
load_events
# Get user activity feed for projects common for both users
@events
=
user
.
recent_events
.
merge
(
projects_for_current_user
).
references
(
:project
).
with_associations
.
limit_recent
(
20
,
params
[
:offset
])
@events
=
user
.
recent_events
.
merge
(
projects_for_current_user
)
.
references
(
:project
)
.
with_associations
.
limit_recent
(
20
,
params
[
:offset
])
end
def
load_projects
...
...
app/finders/events_finder.rb
View file @
0430b764
...
...
@@ -33,8 +33,8 @@ def execute
private
def
by_current_user_access
(
events
)
events
.
merge
(
ProjectsFinder
.
new
(
current_user:
current_user
).
execute
)
.
joins
(
:project
)
events
.
merge
(
ProjectsFinder
.
new
(
current_user:
current_user
).
execute
)
.
joins
(
:project
)
end
def
by_action
(
events
)
...
...
app/finders/group_members_finder.rb
View file @
0430b764
...
...
@@ -8,9 +8,9 @@ def execute
return
group_members
unless
@group
.
parent
parents_members
=
GroupMember
.
non_request
.
where
(
source_id:
@group
.
ancestors
.
select
(
:id
)).
where
.
not
(
user_id:
@group
.
users
.
select
(
:id
))
parents_members
=
GroupMember
.
non_request
.
where
(
source_id:
@group
.
ancestors
.
select
(
:id
))
.
where
.
not
(
user_id:
@group
.
users
.
select
(
:id
))
wheres
=
[
"members.id IN (
#{
group_members
.
select
(
:id
).
to_sql
}
)"
]
wheres
<<
"members.id IN (
#{
parents_members
.
select
(
:id
).
to_sql
}
)"
...
...
app/helpers/form_helper.rb
View file @
0430b764
...
...
@@ -8,10 +8,10 @@ def form_errors(model)
content_tag
(
:div
,
class:
'alert alert-danger'
,
id:
'error_explanation'
)
do
content_tag
(
:h4
,
headline
)
<<
content_tag
(
:ul
)
do
model
.
errors
.
full_messages
.
map
{
|
msg
|
content_tag
(
:li
,
msg
)
}.
join
.
html_safe
model
.
errors
.
full_messages
.
map
{
|
msg
|
content_tag
(
:li
,
msg
)
}
.
join
.
html_safe
end
end
end
...
...
app/helpers/projects_helper.rb
View file @
0430b764
...
...
@@ -194,8 +194,8 @@ def project_list_cache_key(project)
end
def
load_pipeline_status
(
projects
)
Gitlab
::
Cache
::
Ci
::
ProjectPipelineStatus
.
load_in_batch_for_projects
(
projects
)
Gitlab
::
Cache
::
Ci
::
ProjectPipelineStatus
.
load_in_batch_for_projects
(
projects
)
end
private
...
...
app/helpers/search_helper.rb
View file @
0430b764
...
...
@@ -97,8 +97,8 @@ def groups_autocomplete(term, limit = 5)
# Autocomplete results for the current user's projects
def
projects_autocomplete
(
term
,
limit
=
5
)
current_user
.
authorized_projects
.
search_by_title
(
term
)
.
sorted_by_stars
.
non_archived
.
limit
(
limit
).
map
do
|
p
|
current_user
.
authorized_projects
.
search_by_title
(
term
)
.
sorted_by_stars
.
non_archived
.
limit
(
limit
).
map
do
|
p
|
{
category:
"Projects"
,
id:
p
.
id
,
...
...
app/helpers/wiki_helper.rb
View file @
0430b764
...
...
@@ -6,8 +6,8 @@ module WikiHelper
# Returns a String composed of the capitalized name of each directory and the
# capitalized name of the page itself.
def
breadcrumb
(
page_slug
)
page_slug
.
split
(
'/'
)
.
map
{
|
dir_or_page
|
WikiPage
.
unhyphenize
(
dir_or_page
).
capitalize
}.
join
(
' / '
)
page_slug
.
split
(
'/'
)
.
map
{
|
dir_or_page
|
WikiPage
.
unhyphenize
(
dir_or_page
).
capitalize
}
.
join
(
' / '
)
end
end
app/models/award_emoji.rb
View file @
0430b764
...
...
@@ -19,9 +19,9 @@ class AwardEmoji < ActiveRecord::Base
class
<<
self
def
votes_for_collection
(
ids
,
type
)
select
(
'name'
,
'awardable_id'
,
'COUNT(*) as count'
)
.
where
(
'name IN (?) AND awardable_type = ? AND awardable_id IN (?)'
,
[
DOWNVOTE_NAME
,
UPVOTE_NAME
],
type
,
ids
).
group
(
'name'
,
'awardable_id'
)
select
(
'name'
,
'awardable_id'
,
'COUNT(*) as count'
)
.
where
(
'name IN (?) AND awardable_type = ? AND awardable_id IN (?)'
,
[
DOWNVOTE_NAME
,
UPVOTE_NAME
],
type
,
ids
)
.
group
(
'name'
,
'awardable_id'
)
end
end
...
...
app/models/ci/pipeline.rb
View file @
0430b764
...
...
@@ -168,8 +168,8 @@ def stages_count
end
def
stages_names
statuses
.
order
(
:stage_idx
).
distinct
.
pluck
(
:stage
,
:stage_idx
).
map
(
&
:first
)
statuses
.
order
(
:stage_idx
).
distinct
.
pluck
(
:stage
,
:stage_idx
).
map
(
&
:first
)
end
def
legacy_stage
(
name
)
...
...
app/models/ci/runner.rb
View file @
0430b764
...
...
@@ -30,8 +30,8 @@ class Runner < ActiveRecord::Base
scope
:assignable_for
,
->
(
project
)
do
# FIXME: That `to_sql` is needed to workaround a weird Rails bug.
# Without that, placeholders would miss one and couldn't match.
where
(
locked:
false
)
.
where
.
not
(
"id IN (
#{
project
.
runners
.
select
(
:id
).
to_sql
}
)"
).
specific
where
(
locked:
false
)
.
where
.
not
(
"id IN (
#{
project
.
runners
.
select
(
:id
).
to_sql
}
)"
).
specific
end
validate
:tag_constraints
...
...
app/models/concerns/issuable.rb
View file @
0430b764
...
...
@@ -161,9 +161,9 @@ def order_due_date_and_labels_priority(excluded_labels: [])
#
milestones_due_date
=
'MIN(milestones.due_date)'
order_milestone_due_asc
.
order_labels_priority
(
excluded_labels:
excluded_labels
,
extra_select_columns:
[
milestones_due_date
]).
reorder
(
Gitlab
::
Database
.
nulls_last_order
(
milestones_due_date
,
'ASC'
),
order_milestone_due_asc
.
order_labels_priority
(
excluded_labels:
excluded_labels
,
extra_select_columns:
[
milestones_due_date
])
.
reorder
(
Gitlab
::
Database
.
nulls_last_order
(
milestones_due_date
,
'ASC'
),
Gitlab
::
Database
.
nulls_last_order
(
'highest_priority'
,
'ASC'
))
end
...
...
@@ -182,9 +182,9 @@ def order_labels_priority(excluded_labels: [], extra_select_columns: [])
"(
#{
highest_priority
}
) AS highest_priority"
]
+
extra_select_columns
select
(
select_columns
.
join
(
', '
))
.
group
(
arel_table
[
:id
]).
reorder
(
Gitlab
::
Database
.
nulls_last_order
(
'highest_priority'
,
'ASC'
))
select
(
select_columns
.
join
(
', '
))
.
group
(
arel_table
[
:id
])
.
reorder
(
Gitlab
::
Database
.
nulls_last_order
(
'highest_priority'
,
'ASC'
))
end
def
with_label
(
title
,
sort
=
nil
)
...
...
app/models/concerns/relative_positioning.rb
View file @
0430b764
...
...
@@ -18,10 +18,10 @@ def prev_relative_position
prev_pos
=
nil
if
self
.
relative_position
prev_pos
=
self
.
class
.
in_projects
(
project
.
id
).
where
(
'relative_position < ?'
,
self
.
relative_position
).
maximum
(
:relative_position
)
prev_pos
=
self
.
class
.
in_projects
(
project
.
id
)
.
where
(
'relative_position < ?'
,
self
.
relative_position
)
.
maximum
(
:relative_position
)
end
prev_pos
...
...
@@ -31,10 +31,10 @@ def next_relative_position
next_pos
=
nil
if
self
.
relative_position
next_pos
=
self
.
class
.
in_projects
(
project
.
id
).
where
(
'relative_position > ?'
,
self
.
relative_position
).
minimum
(
:relative_position
)
next_pos
=
self
.
class
.
in_projects
(
project
.
id
)
.
where
(
'relative_position > ?'
,
self
.
relative_position
)
.
minimum
(
:relative_position
)
end
next_pos
...
...
app/models/concerns/sortable.rb
View file @
0430b764
...
...
@@ -39,12 +39,12 @@ def order_by(method)
private
def
highest_label_priority
(
target_type_column:
nil
,
target_type:
nil
,
target_column
:,
project_column
:,
excluded_labels:
[])
query
=
Label
.
select
(
LabelPriority
.
arel_table
[
:priority
].
minimum
)
.
left_join_priorities
.
joins
(
:label_links
).
where
(
"label_priorities.project_id =
#{
project_column
}
"
).
where
(
"label_links.target_id =
#{
target_column
}
"
).
reorder
(
nil
)
query
=
Label
.
select
(
LabelPriority
.
arel_table
[
:priority
].
minimum
)
.
left_join_priorities