From 8a03b5424b73679d852fbf43781d9422c83869f7 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 8 Jun 2021 18:10:23 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .eslintrc.yml | 4 - .gitlab/ci/frontend.gitlab-ci.yml | 15 - .gitlab/ci/global.gitlab-ci.yml | 8 +- .gitlab/ci/pages.gitlab-ci.yml | 2 - GITALY_SERVER_VERSION | 2 +- .../components/content_editor.vue | 6 +- .../content_editor/components/top_toolbar.vue | 9 + .../extensions/code_block_highlight.js | 18 +- .../content_editor/services/content_editor.js | 7 + .../queries/get_user_callouts.query.graphql | 0 .../shared/wikis/components/wiki_form.vue | 35 +- .../pages/shared/wikis/constants.js | 4 + .../graph/graph_component_wrapper.vue | 2 +- app/assets/javascripts/repository/index.js | 3 + .../components/todo_button.stories.js | 23 - .../components/user_callout_dismisser.vue | 175 + app/assets/stylesheets/page_bundles/wiki.scss | 1 + app/assets/stylesheets/pages/tree.scss | 10 +- app/controllers/projects/wikis_controller.rb | 4 - app/models/import_export_upload.rb | 3 + app/models/pages/lookup_path.rb | 40 +- .../import_export_clean_up_service.rb | 44 +- app/views/projects/_files.html.haml | 2 +- .../merge_requests/_mr_title.html.haml | 8 +- .../projects/merge_requests/_widget.html.haml | 37 +- .../projects/tree/_tree_header.html.haml | 4 +- app/workers/all_queues.yml | 9 - app/workers/pipeline_process_worker.rb | 4 +- app/workers/pipeline_update_worker.rb | 19 - .../abort_deleted_project_pipelines.yml | 2 +- .../development/allow_unsafe_ruby_regexp.yml | 2 +- .../development/artifacts_management_page.yml | 2 +- .../auto_devops_banner_disabled.yml | 2 +- ...ontent_editor.yml => cached_mr_widget.yml} | 12 +- .../development/ci_artifacts_exclude.yml | 2 +- .../development/ci_build_metadata_config.yml | 2 +- .../ci_delete_objects_high_concurrency.yml | 2 +- .../ci_delete_objects_medium_concurrency.yml | 2 +- .../ci_drop_cyclical_triggered_pipelines.yml | 2 +- ...drop_new_builds_when_ci_quota_exceeded.yml | 2 +- .../development/ci_dynamic_child_pipeline.yml | 2 +- .../development/ci_enable_live_trace.yml | 2 +- .../ci_minutes_track_live_consumption.yml | 2 +- .../ci_pending_builds_queue_maintain.yml | 2 +- .../development/ci_pipeline_latest.yml | 2 +- ...ne_status_omit_commit_sha_in_cache_key.yml | 2 +- .../ci_pipeline_triggers_settings_vue_ui.yml | 2 +- .../ci_require_credit_card_on_free_plan.yml | 2 +- .../ci_require_credit_card_on_trial_plan.yml | 2 +- ...i_runners_short_circuit_assignable_for.yml | 2 +- .../ci_runners_tokens_optional_encryption.yml | 2 +- ...ci_skip_persistent_ref_existence_check.yml | 2 +- .../development/ci_yaml_limit_size.yml | 2 +- .../efficient_counter_attribute.yml | 2 +- ...ady_archived_jobs_when_archiving_again.yml | 2 +- .../git_push_create_all_pipelines.yml | 2 +- ...lab_ci_archived_trace_consistent_reads.yml | 2 +- .../gitlab_ci_builds_queuing_metrics.yml | 2 +- .../development/jobs_table_vue.yml | 2 +- ..._balancing_for_pipeline_process_worker.yml | 2 +- ...associations_jobs_request_api_endpoint.yml | 2 +- .../prevent_retry_of_retried_jobs.yml | 2 +- .../development/s3_multithreaded_uploads.yml | 2 +- ...tinct_in_register_job_object_hierarchy.yml | 2 +- config/feature_flags/ops/ci_accept_trace.yml | 2 +- .../ops/ci_queueing_disaster_recovery.yml | 2 +- .../ops/ci_trace_log_invalid_chunks.yml | 2 +- doc/.vale/gitlab/Acronyms.yml | 10 + doc/.vale/gitlab/spelling-exceptions.txt | 2 + .../auth/ldap/ldap-troubleshooting.md | 2 +- doc/administration/file_hooks.md | 2 +- doc/administration/geo/index.md | 2 +- doc/administration/issue_closing_pattern.md | 2 +- doc/administration/libravatar.md | 2 +- doc/administration/logs.md | 2 +- doc/administration/maintenance_mode/index.md | 4 +- .../operations/cleaning_up_redis_sessions.md | 2 +- .../operations/extra_sidekiq_processes.md | 4 +- .../packages/container_registry.md | 2 +- doc/administration/pseudonymizer.md | 2 +- .../replication_and_failover_external.md | 4 +- .../gitlab_rails_cheat_sheet.md | 8 +- doc/api/README.md | 4 +- doc/api/graphql/index.md | 2 +- doc/api/graphql/reference/index.md | 64 + doc/api/projects.md | 2 +- doc/api/services.md | 2 +- .../index.md | 2 +- doc/ci/caching/index.md | 10 +- doc/ci/examples/README.md | 4 +- doc/ci/jobs/index.md | 2 +- doc/ci/yaml/README.md | 6 +- doc/development/README.md | 2 +- doc/development/api_graphql_styleguide.md | 6 +- doc/development/api_styleguide.md | 8 +- doc/development/application_limits.md | 2 +- doc/development/architecture.md | 32 +- doc/development/auto_devops.md | 8 +- doc/development/changelog.md | 2 +- doc/development/cicd/index.md | 6 +- doc/development/contributing/index.md | 2 +- .../contributing/issue_workflow.md | 4 +- .../contributing/merge_request_workflow.md | 4 +- doc/development/dangerbot.md | 2 +- doc/development/documentation/index.md | 10 +- .../site_architecture/global_nav.md | 2 +- .../documentation/site_architecture/index.md | 2 +- .../documentation/styleguide/word_list.md | 139 +- doc/development/documentation/testing.md | 6 +- doc/development/documentation/workflow.md | 2 +- doc/development/ee_features.md | 4 +- doc/development/elasticsearch.md | 14 +- .../experiment_guide/experimentation.md | 2 +- doc/development/fe_guide/content_editor.md | 116 + .../fe_guide/design_anti_patterns.md | 4 +- doc/development/fe_guide/frontend_faq.md | 6 +- doc/development/fe_guide/graphql.md | 2 +- .../img/content_editor_highlevel_diagram.png | Bin 0 -> 47794 bytes doc/development/fe_guide/index.md | 5 + doc/development/fe_guide/storybook.md | 50 - doc/development/fe_guide/vue.md | 2 +- doc/development/fe_guide/vuex.md | 2 +- doc/development/feature_flags/index.md | 2 +- doc/development/file_storage.md | 2 +- doc/development/geo.md | 8 +- doc/development/gotchas.md | 2 +- .../graphql_guide/authorization.md | 2 +- doc/development/graphql_guide/pagination.md | 2 +- doc/development/i18n/externalization.md | 6 +- doc/development/i18n/proofreader.md | 2 +- doc/development/import_project.md | 2 +- doc/development/integrations/codesandbox.md | 2 +- .../secure_partner_integration.md | 2 +- doc/development/kubernetes.md | 14 +- doc/development/licensing.md | 2 +- doc/development/logging.md | 6 +- doc/development/maintenance_mode.md | 2 +- .../multi_version_compatibility.md | 2 +- .../namespaces_storage_statistics.md | 4 +- .../new_fe_guide/modules/dirty_submit.md | 2 +- doc/development/packages.md | 6 +- doc/development/permissions.md | 2 +- doc/development/pipelines.md | 36 +- doc/development/prometheus_metrics.md | 2 +- doc/development/query_recorder.md | 2 +- doc/development/reactive_caching.md | 2 +- doc/development/redis.md | 10 +- doc/development/reference_processing.md | 16 +- doc/development/scalability.md | 6 +- doc/development/secure_coding_guidelines.md | 2 +- .../end_to_end/beginners_guide.md | 6 +- .../testing_guide/end_to_end/feature_flags.md | 2 +- .../testing_guide/end_to_end/index.md | 4 +- ...unning_tests_that_require_special_setup.md | 4 +- doc/development/testing_guide/flaky_tests.md | 2 +- .../testing_guide/frontend_testing.md | 18 +- .../testing_guide/testing_levels.md | 2 +- doc/development/uploads.md | 8 +- doc/development/utilities.md | 8 +- doc/development/wikis.md | 2 +- doc/install/installation.md | 6 +- doc/integration/elasticsearch.md | 26 +- doc/integration/kerberos.md | 6 +- doc/integration/omniauth.md | 2 +- doc/legal/index.md | 2 +- doc/policy/maintenance.md | 2 +- doc/push_rules/push_rules.md | 2 +- doc/raketasks/backup_restore.md | 2 +- doc/security/crime_vulnerability.md | 2 +- doc/topics/autodevops/customize.md | 8 +- doc/topics/autodevops/index.md | 2 +- doc/topics/autodevops/stages.md | 2 +- doc/update/index.md | 2 +- doc/update/patch_versions.md | 2 +- doc/update/upgrading_from_ce_to_ee.md | 2 +- doc/update/upgrading_from_source.md | 8 +- .../settings/rate_limit_on_notes_creation.md | 2 +- .../settings/sign_in_restrictions.md | 2 +- .../application_security/api_fuzzing/index.md | 14 +- .../container_scanning/index.md | 6 +- .../coverage_fuzzing/index.md | 2 +- doc/user/application_security/dast/index.md | 4 +- .../application_security/dast_api/index.md | 14 +- .../dependency_scanning/index.md | 2 +- doc/user/application_security/index.md | 4 +- doc/user/application_security/sast/index.md | 2 +- doc/user/clusters/agent/index.md | 2 +- doc/user/clusters/agent/repository.md | 50 + doc/user/clusters/applications.md | 12 +- .../compliance/license_compliance/index.md | 2 +- doc/user/group/insights/index.md | 2 +- doc/user/group/saml_sso/index.md | 2 +- doc/user/group/settings/import_export.md | 2 +- doc/user/markdown.md | 30 +- .../project/clusters/add_remove_clusters.md | 9 + doc/user/project/clusters/serverless/index.md | 4 +- doc/user/project/deploy_tokens/index.md | 2 +- doc/user/project/description_templates.md | 2 +- doc/user/project/integrations/overview.md | 2 +- doc/user/project/issues/design_management.md | 2 +- doc/user/project/labels.md | 2 +- .../merge_requests/accessibility_testing.md | 4 +- .../browser_performance_testing.md | 4 +- .../load_performance_testing.md | 4 +- doc/user/project/settings/import_export.md | 2 +- .../project/wiki/img/content_editor_v14.0.png | Bin 0 -> 9635 bytes .../wiki/img/use_new_editor_button_v14.0.png | Bin 0 -> 20030 bytes doc/user/project/wiki/index.md | 35 +- doc/user/reserved_names.md | 2 +- lib/gitlab/import_export/shared.rb | 2 +- package.json | 5 +- spec/docs_screenshots/wiki_docs.rb | 47 + .../components/top_toolbar_spec.js | 1 + .../extensions/code_block_highlight_spec.js | 37 + .../shared/wikis/components/wiki_form_spec.js | 56 +- .../graph/graph_component_wrapper_spec.js | 2 +- .../user_callout_dismisser_mock_data.js | 30 + .../components/user_callout_dismisser_spec.js | 306 + spec/lib/gitlab/import_export/shared_spec.rb | 22 + spec/models/import_export_upload_spec.rb | 19 + spec/models/pages/lookup_path_spec.rb | 9 +- .../import_export_clean_up_service_spec.rb | 79 +- spec/workers/every_sidekiq_worker_spec.rb | 1 - storybook/.gitignore | 2 - storybook/config/main.js | 8 - storybook/config/preview.js | 7 - storybook/config/webpack.config.js | 103 - storybook/package.json | 20 - storybook/yarn.lock | 10766 ---------------- yarn.lock | 72 +- 230 files changed, 1705 insertions(+), 11575 deletions(-) rename app/assets/javascripts/{pipelines/graphql => graphql_shared}/queries/get_user_callouts.query.graphql (100%) create mode 100644 app/assets/javascripts/pages/shared/wikis/constants.js delete mode 100644 app/assets/javascripts/vue_shared/components/todo_button.stories.js create mode 100644 app/assets/javascripts/vue_shared/components/user_callout_dismisser.vue delete mode 100644 app/workers/pipeline_update_worker.rb rename config/feature_flags/development/{wiki_content_editor.yml => cached_mr_widget.yml} (72%) create mode 100644 doc/development/fe_guide/content_editor.md create mode 100644 doc/development/fe_guide/img/content_editor_highlevel_diagram.png delete mode 100644 doc/development/fe_guide/storybook.md create mode 100644 doc/user/project/wiki/img/content_editor_v14.0.png create mode 100644 doc/user/project/wiki/img/use_new_editor_button_v14.0.png create mode 100644 spec/docs_screenshots/wiki_docs.rb create mode 100644 spec/frontend/content_editor/extensions/code_block_highlight_spec.js create mode 100644 spec/frontend/vue_shared/components/user_callout_dismisser_mock_data.js create mode 100644 spec/frontend/vue_shared/components/user_callout_dismisser_spec.js delete mode 100644 storybook/.gitignore delete mode 100644 storybook/config/main.js delete mode 100644 storybook/config/preview.js delete mode 100644 storybook/config/webpack.config.js delete mode 100644 storybook/package.json delete mode 100644 storybook/yarn.lock diff --git a/.eslintrc.yml b/.eslintrc.yml index 463b44447d4..7ec7abca2e4 100644 --- a/.eslintrc.yml +++ b/.eslintrc.yml @@ -112,7 +112,3 @@ overrides: import/no-nodejs-modules: off filenames/match-regex: off no-console: off - - files: - - '*.stories.js' - rules: - filenames/match-regex: off diff --git a/.gitlab/ci/frontend.gitlab-ci.yml b/.gitlab/ci/frontend.gitlab-ci.yml index 03c0fab6f8b..dfd595c2696 100644 --- a/.gitlab/ci/frontend.gitlab-ci.yml +++ b/.gitlab/ci/frontend.gitlab-ci.yml @@ -344,18 +344,3 @@ startup-css-check as-if-foss: needs: - job: "compile-test-assets as-if-foss" - job: "rspec frontend_fixture as-if-foss" - -compile-storybook: - extends: - - .compile-assets-base - script: - - source scripts/utils.sh - - cd storybook/ - - run_timed_command "retry yarn install --frozen-lockfile" - - yarn build - artifacts: - name: storybook - expire_in: 31d - when: always - paths: - - storybook/public diff --git a/.gitlab/ci/global.gitlab-ci.yml b/.gitlab/ci/global.gitlab-ci.yml index 5bff0d67d03..5d2be0f03ae 100644 --- a/.gitlab/ci/global.gitlab-ci.yml +++ b/.gitlab/ci/global.gitlab-ci.yml @@ -159,7 +159,7 @@ - *assets-cache-push .use-pg11: - image: "registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.7.2.patched-golang-1.14-git-2.31-lfs-2.9-chrome-89-node-14.15-yarn-1.22-postgresql-11-graphicsmagick-1.3.36" + image: "registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.7.2.patched-golang-1.16-git-2.31-lfs-2.9-chrome-89-node-14.15-yarn-1.22-postgresql-11-graphicsmagick-1.3.36" services: - name: postgres:11.6 command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"] @@ -168,7 +168,7 @@ POSTGRES_HOST_AUTH_METHOD: trust .use-pg12: - image: "registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.7.2.patched-golang-1.14-git-2.31-lfs-2.9-chrome-89-node-14.15-yarn-1.22-postgresql-12-graphicsmagick-1.3.36" + image: "registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.7.2.patched-golang-1.16-git-2.31-lfs-2.9-chrome-89-node-14.15-yarn-1.22-postgresql-12-graphicsmagick-1.3.36" services: - name: postgres:12 command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"] @@ -177,7 +177,7 @@ POSTGRES_HOST_AUTH_METHOD: trust .use-pg11-ee: - image: "registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.7.2.patched-golang-1.14-git-2.31-lfs-2.9-chrome-89-node-14.15-yarn-1.22-postgresql-11-graphicsmagick-1.3.36" + image: "registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.7.2.patched-golang-1.16-git-2.31-lfs-2.9-chrome-89-node-14.15-yarn-1.22-postgresql-11-graphicsmagick-1.3.36" services: - name: postgres:11.6 command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"] @@ -188,7 +188,7 @@ POSTGRES_HOST_AUTH_METHOD: trust .use-pg12-ee: - image: "registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.7.2.patched-golang-1.14-git-2.31-lfs-2.9-chrome-89-node-14.15-yarn-1.22-postgresql-12-graphicsmagick-1.3.36" + image: "registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.7.2.patched-golang-1.16-git-2.31-lfs-2.9-chrome-89-node-14.15-yarn-1.22-postgresql-12-graphicsmagick-1.3.36" services: - name: postgres:12 command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"] diff --git a/.gitlab/ci/pages.gitlab-ci.yml b/.gitlab/ci/pages.gitlab-ci.yml index 89ce31b5bea..b6d4b0ef11d 100644 --- a/.gitlab/ci/pages.gitlab-ci.yml +++ b/.gitlab/ci/pages.gitlab-ci.yml @@ -8,14 +8,12 @@ pages: - coverage-frontend - karma - compile-production-assets - - compile-storybook script: - mv public/ .public/ - mkdir public/ - mv coverage/ public/coverage-ruby/ || true - mv coverage-frontend/ public/coverage-frontend/ || true - mv coverage-javascript/ public/coverage-javascript/ || true - - mv storybook/public public/storybook || true - cp .public/assets/application-*.css public/application.css || true - cp .public/assets/application-*.css.gz public/application.css.gz || true artifacts: diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index 2b2f7babe8b..bfd59c5ffca 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -df2eb006d241b399b8b6b877afab97713bb5c36a +22f7db01953debe8e7c1c46ff2b1ffb5a143c566 diff --git a/app/assets/javascripts/content_editor/components/content_editor.vue b/app/assets/javascripts/content_editor/components/content_editor.vue index 1a1e6cb900d..c6ab2e189ef 100644 --- a/app/assets/javascripts/content_editor/components/content_editor.vue +++ b/app/assets/javascripts/content_editor/components/content_editor.vue @@ -17,7 +17,11 @@ export default { };