From 927df95cc4453bdacbc59960df32008b02c4e28a Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 15 May 2020 12:08:28 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .rubocop_todo.yml | 11 - .../components/alert_management_list.vue | 4 +- app/assets/javascripts/header.js | 23 +- .../monitoring/components/dashboard.vue | 26 +- .../javascripts/monitoring/stores/getters.js | 4 +- .../notes/components/note_header.vue | 9 +- .../badges/gitlab_team_member_badge.vue | 27 - app/assets/stylesheets/framework/header.scss | 1 + app/finders/freeze_periods_finder.rb | 14 + app/models/ci/freeze_period.rb | 2 + app/models/group.rb | 7 +- app/models/milestone.rb | 8 + app/policies/ci/freeze_period_policy.rb | 7 + app/policies/project_policy.rb | 4 + .../management/create_project_service.rb | 7 +- app/services/merge_requests/base_service.rb | 2 + app/services/projects/create_service.rb | 16 +- .../user_project_access_changed_service.rb | 13 +- .../header/_current_user_dropdown.html.haml | 1 + .../shared/_auto_devops_callout.html.haml | 2 +- app/views/shared/_clone_panel.html.haml | 2 +- .../shared/_mini_pipeline_graph.html.haml | 2 +- app/views/shared/_no_ssh.html.haml | 2 +- app/views/shared/issuable/_nav.html.haml | 8 +- ...lity-check-on-list-endpoint-by-default.yml | 5 + ...ndefined-method-admin-for-nil-nilclass.yml | 6 + ...---app-views-shared-issuable-_nav-html.yml | 5 + ...gs-from---app-views-shared--aria-label.yml | 5 + .../24295-freeze-period-API-changes.yml | 5 + .../ab-fix-not-null-inconsistency.yml | 5 + ...ion_checksum_field_type_in_package_file.rb | 17 + ...5456_add_checksum_index_to_package_file.rb | 17 + ...not_null_check_constraint_inconsistency.rb | 20 + db/structure.sql | 7 +- .../how_to_configure_ldap_gitlab_ee/index.md | 6 +- .../gitlab_rails_cheat_sheet.md | 4 +- doc/api/merge_requests.md | 10 + doc/development/code_review.md | 6 + doc/development/geo/framework.md | 2 +- .../testing_guide/best_practices.md | 4 +- doc/install/requirements.md | 6 +- doc/user/group/epics/img/epic_view_v13.0.png | Bin 68803 -> 54891 bytes doc/user/project/static_site_editor/index.md | 6 + doc/user/snippets.md | 4 +- lib/api/api.rb | 1 + lib/api/entities/freeze_period.rb | 11 + lib/api/entities/merge_request_basic.rb | 6 +- lib/api/freeze_periods.rb | 107 ++++ lib/api/groups.rb | 2 +- lib/api/helpers/merge_requests_helpers.rb | 1 + lib/api/merge_requests.rb | 3 + lib/container_registry/client.rb | 17 + lib/gitlab/experimentation.rb | 3 + lib/gitlab/git/commit.rb | 14 +- lib/gitlab/usage_data.rb | 51 +- locale/gitlab.pot | 30 ++ package.json | 2 +- .../repositories/git_http_controller_spec.rb | 3 + spec/finders/freeze_periods_finder_spec.rb | 59 +++ .../serverless/functions_finder_spec.rb | 1 + .../schemas/public_api/v4/freeze_period.json | 20 + .../schemas/public_api/v4/freeze_periods.json | 5 + spec/frontend/header_spec.js | 16 +- .../monitoring/components/dashboard_spec.js | 69 +-- .../components/dashboard_template_spec.js | 3 + spec/frontend/monitoring/store_utils.js | 11 +- .../notes/components/note_header_spec.js | 15 - .../stores/modules/detail/mutations_spec.js | 24 +- spec/lib/container_registry/client_spec.rb | 52 +- spec/lib/gitlab/git/commit_spec.rb | 20 + .../gitlab/hook_data/issuable_builder_spec.rb | 1 + .../legacy_github_import/importer_spec.rb | 1 + spec/lib/gitlab/usage_data_spec.rb | 77 +-- spec/models/ci/freeze_period_spec.rb | 14 +- spec/models/event_spec.rb | 8 + spec/models/milestone_spec.rb | 18 + spec/requests/api/freeze_periods_spec.rb | 475 ++++++++++++++++++ spec/requests/api/groups_spec.rb | 40 +- spec/requests/api/merge_requests_spec.rb | 31 +- spec/services/projects/create_service_spec.rb | 77 +++ ...ser_project_access_changed_service_spec.rb | 9 + spec/support/helpers/usage_data_helpers.rb | 37 +- .../features/error_tracking_shared_example.rb | 14 +- .../issuable_hook_data_shared_examples.rb | 1 + yarn.lock | 8 +- 85 files changed, 1403 insertions(+), 296 deletions(-) delete mode 100644 app/assets/javascripts/vue_shared/components/user_avatar/badges/gitlab_team_member_badge.vue create mode 100644 app/finders/freeze_periods_finder.rb create mode 100644 app/policies/ci/freeze_period_policy.rb create mode 100644 changelogs/unreleased/217455-skip-mergeability-check-on-list-endpoint-by-default.yml create mode 100644 changelogs/unreleased/217708-nomethoderror-undefined-method-admin-for-nil-nilclass.yml create mode 100644 changelogs/unreleased/22691-externalize-i18n-strings-from---app-views-shared-issuable-_nav-html.yml create mode 100644 changelogs/unreleased/22691-externelize-i18n-strings-from---app-views-shared--aria-label.yml create mode 100644 changelogs/unreleased/24295-freeze-period-API-changes.yml create mode 100644 changelogs/unreleased/ab-fix-not-null-inconsistency.yml create mode 100644 db/migrate/20200409105455_change_verification_checksum_field_type_in_package_file.rb create mode 100644 db/migrate/20200409105456_add_checksum_index_to_package_file.rb create mode 100644 db/migrate/20200513160930_fix_not_null_check_constraint_inconsistency.rb create mode 100644 lib/api/entities/freeze_period.rb create mode 100644 lib/api/freeze_periods.rb create mode 100644 spec/finders/freeze_periods_finder_spec.rb create mode 100644 spec/fixtures/api/schemas/public_api/v4/freeze_period.json create mode 100644 spec/fixtures/api/schemas/public_api/v4/freeze_periods.json create mode 100644 spec/requests/api/freeze_periods_spec.rb diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index c359670759e..bd0f9184cd6 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -208,17 +208,6 @@ Naming/RescuedExceptionsVariableName: RSpec/ContextWording: Enabled: false -RSpec/EmptyLineAfterSharedExample: - Exclude: - - 'ee/spec/mailers/notify_spec.rb' - - 'ee/spec/services/quick_actions/interpret_service_spec.rb' - - 'spec/controllers/repositories/git_http_controller_spec.rb' - - 'spec/finders/projects/serverless/functions_finder_spec.rb' - - 'spec/lib/gitlab/hook_data/issuable_builder_spec.rb' - - 'spec/lib/gitlab/legacy_github_import/importer_spec.rb' - - 'spec/models/event_spec.rb' - - 'spec/support/shared_examples/models/issuable_hook_data_shared_examples.rb' - # Offense count: 879 # Cop supports --auto-correct. # Configuration parameters: EnforcedStyle. diff --git a/app/assets/javascripts/alert_management/components/alert_management_list.vue b/app/assets/javascripts/alert_management/components/alert_management_list.vue index 857e5717045..b9edbb4b0a0 100644 --- a/app/assets/javascripts/alert_management/components/alert_management_list.vue +++ b/app/assets/javascripts/alert_management/components/alert_management_list.vue @@ -148,7 +148,7 @@ export default { }, }, methods: { - filterALertsByStatus(tabIndex) { + filterAlertsByStatus(tabIndex) { this.statusFilter = this.$options.statusTabs[tabIndex].filters; }, capitalizeFirstCharacter, @@ -184,7 +184,7 @@ export default { {{ $options.i18n.errorMsg }} - +