From a93bf027c2619af8c11b030414c339346f13ead6 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 7 Jul 2020 15:08:49 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .gitlab/ci/rules.gitlab-ci.yml | 4 +- .../ide/components/branches/item.vue | 2 +- .../components/commit_sidebar/empty_state.vue | 2 +- .../commit_sidebar/success_message.vue | 2 +- .../ide/components/file_templates/bar.vue | 2 +- .../javascripts/ide/components/jobs/item.vue | 2 +- .../ide/components/merge_requests/item.vue | 2 +- .../ide/components/merge_requests/list.vue | 2 +- app/assets/javascripts/ide/lib/editor.js | 4 +- .../javascripts/ide/lib/schemas/index.js | 4 + .../javascripts/ide/lib/schemas/json/index.js | 8 ++ .../ide/lib/schemas/yaml/gitlab_ci.js | 4 + .../javascripts/ide/lib/schemas/yaml/index.js | 12 ++ app/assets/javascripts/ide/utils.js | 15 ++- .../components/issuable_list_root_app.vue | 12 +- .../get_issues_list_details.query.graphql | 5 +- .../issue_show/components/edit_actions.vue | 2 +- .../components/test_reports/test_summary.vue | 2 +- .../reports/components/report_item.vue | 2 +- .../reports/components/summary_row.vue | 2 +- .../components/mr_collapsible_extension.vue | 2 +- .../mr_widget_expandable_section.vue | 2 +- .../components/mr_widget_icon.vue | 2 +- .../components/mr_widget_pipeline.vue | 2 +- .../components/mr_widget_status_icon.vue | 2 +- .../components/states/commits_header.vue | 2 +- .../components/states/squash_before_merge.vue | 13 ++- .../components/terraform/terraform_plan.vue | 2 +- .../components/file_finder/index.vue | 2 +- .../markdown/suggestion_diff_header.vue | 24 ++-- .../services/build_custom_renderer.js | 12 +- .../renderers/render_identifier_paragraph.js | 16 +++ .../renderers/render_identifier_text.js | 81 -------------- app/assets/stylesheets/framework/common.scss | 1 - app/helpers/application_settings_helper.rb | 8 +- .../application_setting_implementation.rb | 8 +- app/models/project_statistics.rb | 7 +- .../_import_export_limits.html.haml | 34 ++++++ .../application_settings/network.html.haml | 11 ++ .../ci/variables/_variable_row.html.haml | 4 +- app/views/dashboard/todos/index.html.haml | 2 +- app/views/groups/_home_panel.html.haml | 2 +- app/views/projects/_home_panel.html.haml | 2 +- .../projects/forks/_fork_button.html.haml | 4 +- app/views/projects/forks/new.html.haml | 2 +- app/views/shared/projects/_project.html.haml | 4 +- .../unreleased/218472-gitlab-ci-linting.yml | 5 + ...indicate-temporarily-increased-storage.yml | 5 + ...-count-to-imported-jira-issues-message.yml | 5 + ...rt-rate-limits-as-application-settings.yml | 5 + .../unreleased/id-fix-timeout-query.yml | 5 + .../ps-find-remote-is-storage-scoped.yml | 5 + config/gitlab.yml.example | 7 +- config/initializers/1_settings.rb | 3 - config/plugins/monaco_webpack.js | 17 +++ config/webpack.config.js | 4 +- ...0225160300_steal_encrypt_runners_tokens.rb | 19 ---- ...t_export_limits_to_application_settings.rb | 15 +++ ...ry_storage_increase_to_namespace_limits.rb | 9 ++ db/structure.sql | 12 +- .../monitoring/prometheus/gitlab_metrics.md | 4 +- doc/api/groups.md | 8 +- doc/api/users.md | 8 +- doc/integration/saml.md | 9 +- doc/policy/maintenance.md | 28 +++-- doc/security/rate_limits.md | 1 + .../img/import_export_rate_limits_v13_2.png | Bin 0 -> 54802 bytes .../settings/import_export_rate_limits.md | 32 ++++++ .../settings/rate_limit_on_issues_creation.md | 2 +- .../repository/repository_mirroring.md | 4 +- jest.config.base.js | 4 +- lib/gitlab/application_rate_limiter.rb | 24 ++-- .../background_migration/digest_column.rb | 25 ----- .../background_migration/encrypt_columns.rb | 104 ------------------ .../encrypt_runners_tokens.rb | 32 ------ .../models/encrypt_columns/namespace.rb | 28 ----- .../models/encrypt_columns/project.rb | 28 ----- .../models/encrypt_columns/runner.rb | 28 ----- .../models/encrypt_columns/settings.rb | 37 ------- .../models/encrypt_columns/web_hook.rb | 28 ----- lib/gitlab/code_navigation_path.rb | 2 +- lib/gitlab/gitaly_client/remote_service.rb | 6 +- lib/gitlab/instrumentation/redis_base.rb | 4 +- lib/quality/test_level.rb | 8 ++ locale/gitlab.pot | 40 +++++-- package.json | 8 +- .../changing_repository_storage_spec.rb | 2 +- spec/controllers/groups_controller_spec.rb | 4 +- spec/controllers/projects_controller_spec.rb | 4 +- .../frontend/__mocks__/monaco-editor/index.js | 2 + .../ide/components/repo_editor_spec.js | 2 + spec/frontend/ide/lib/editor_spec.js | 8 ++ spec/frontend/ide/utils_spec.js | 52 +++++++++ .../components/issuable_list_root_app_spec.js | 3 +- .../mr_widget_squash_before_merge_spec.js | 25 ++++- .../markdown/suggestion_diff_header_spec.js | 7 +- .../rich_content_editor/mock_data.js | 31 ++---- .../render_identifier_paragraph_spec.js | 55 +++++++++ .../renderers/render_identifier_text_spec.js | 61 ---------- ...d_merge_request_diff_commits_count_spec.rb | 6 +- .../archive_legacy_traces_spec.rb | 2 +- ...ckfill_hashed_project_repositories_spec.rb | 2 +- ...ckfill_legacy_project_repositories_spec.rb | 2 +- ...ll_project_fullpath_in_repo_config_spec.rb | 2 +- .../backfill_snippet_repositories_spec.rb | 6 +- .../digest_column_spec.rb | 46 -------- .../encrypt_columns_spec.rb | 96 ---------------- .../encrypt_runners_tokens_spec.rb | 79 ------------- .../fix_cross_project_label_links_spec.rb | 2 +- .../migrate_build_stage_spec.rb | 6 +- .../migrate_legacy_artifacts_spec.rb | 2 +- .../migrate_stage_index_spec.rb | 32 +++--- ...cluster_kubernetes_namespace_table_spec.rb | 2 +- .../untracked_file_spec.rb | 3 +- .../populate_untracked_uploads_spec.rb | 3 +- .../prepare_untracked_uploads_spec.rb | 2 +- .../remove_restricted_todos_spec.rb | 14 ++- .../schedule_calculate_wiki_sizes_spec.rb | 64 ----------- ...nfidential_note_events_on_services_spec.rb | 2 +- ...nfidential_note_events_on_webhooks_spec.rb | 2 +- spec/lib/gitlab/code_navigation_path_spec.rb | 2 +- .../gitaly_client/remote_service_spec.rb | 3 + spec/lib/quality/test_level_spec.rb | 4 +- spec/migrations/active_record/schema_spec.rb | 2 +- .../schedule_calculate_wiki_sizes_spec.rb | 60 ++++++++++ spec/requests/api/group_export_spec.rb | 8 +- spec/requests/api/project_export_spec.rb | 4 +- .../import/gitlab_groups_controller_spec.rb | 2 + .../background_migrations_matchers.rb | 3 +- yarn.lock | 60 ++++------ 130 files changed, 725 insertions(+), 1013 deletions(-) create mode 100644 app/assets/javascripts/ide/lib/schemas/index.js create mode 100644 app/assets/javascripts/ide/lib/schemas/json/index.js create mode 100644 app/assets/javascripts/ide/lib/schemas/yaml/gitlab_ci.js create mode 100644 app/assets/javascripts/ide/lib/schemas/yaml/index.js create mode 100644 app/assets/javascripts/vue_shared/components/rich_content_editor/services/renderers/render_identifier_paragraph.js delete mode 100644 app/assets/javascripts/vue_shared/components/rich_content_editor/services/renderers/render_identifier_text.js create mode 100644 app/views/admin/application_settings/_import_export_limits.html.haml create mode 100644 changelogs/unreleased/218472-gitlab-ci-linting.yml create mode 100644 changelogs/unreleased/227054-eng-add-db-column-to-indicate-temporarily-increased-storage.yml create mode 100644 changelogs/unreleased/cngo-add-count-to-imported-jira-issues-message.yml create mode 100644 changelogs/unreleased/georgekoltsov-import-export-rate-limits-as-application-settings.yml create mode 100644 changelogs/unreleased/id-fix-timeout-query.yml create mode 100644 changelogs/unreleased/ps-find-remote-is-storage-scoped.yml create mode 100644 config/plugins/monaco_webpack.js delete mode 100644 db/migrate/20190225160300_steal_encrypt_runners_tokens.rb create mode 100644 db/migrate/20200701093859_add_import_export_limits_to_application_settings.rb create mode 100644 db/migrate/20200706170536_add_temporary_storage_increase_to_namespace_limits.rb create mode 100644 doc/user/admin_area/settings/img/import_export_rate_limits_v13_2.png create mode 100644 doc/user/admin_area/settings/import_export_rate_limits.md delete mode 100644 lib/gitlab/background_migration/digest_column.rb delete mode 100644 lib/gitlab/background_migration/encrypt_columns.rb delete mode 100644 lib/gitlab/background_migration/encrypt_runners_tokens.rb delete mode 100644 lib/gitlab/background_migration/models/encrypt_columns/namespace.rb delete mode 100644 lib/gitlab/background_migration/models/encrypt_columns/project.rb delete mode 100644 lib/gitlab/background_migration/models/encrypt_columns/runner.rb delete mode 100644 lib/gitlab/background_migration/models/encrypt_columns/settings.rb delete mode 100644 lib/gitlab/background_migration/models/encrypt_columns/web_hook.rb create mode 100644 spec/frontend/vue_shared/components/rich_content_editor/services/renderers/render_identifier_paragraph_spec.js delete mode 100644 spec/frontend/vue_shared/components/rich_content_editor/services/renderers/render_identifier_text_spec.js delete mode 100644 spec/lib/gitlab/background_migration/digest_column_spec.rb delete mode 100644 spec/lib/gitlab/background_migration/encrypt_columns_spec.rb delete mode 100644 spec/lib/gitlab/background_migration/encrypt_runners_tokens_spec.rb delete mode 100644 spec/lib/gitlab/background_migration/schedule_calculate_wiki_sizes_spec.rb create mode 100644 spec/migrations/schedule_calculate_wiki_sizes_spec.rb diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml index 7b044ac4bfb..4a65e9950cd 100644 --- a/.gitlab/ci/rules.gitlab-ci.yml +++ b/.gitlab/ci/rules.gitlab-ci.yml @@ -118,8 +118,8 @@ - "{,ee/}spec/**/*.rb" .db-patterns: &db-patterns - - "{,ee/}{db}/**/*" - - "{,ee}/spec/{db,migrations}/**/*" + - "{,ee/}{,spec/}{db,migrations}/**/*" + - "{,ee/}{,spec/}lib/{,ee/}gitlab/background_migration/**/*" .backstage-patterns: &backstage-patterns - "Dangerfile" diff --git a/app/assets/javascripts/ide/components/branches/item.vue b/app/assets/javascripts/ide/components/branches/item.vue index e7f4cd796b5..49744d573da 100644 --- a/app/assets/javascripts/ide/components/branches/item.vue +++ b/app/assets/javascripts/ide/components/branches/item.vue @@ -33,7 +33,7 @@ export default {