From 206b03aeae3a368983ac3d6ad5e5828030bbaacd Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 10 Nov 2020 18:09:07 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- GITALY_SERVER_VERSION | 2 +- Gemfile | 2 +- Gemfile.lock | 7 +- .../repository/components/preview/index.vue | 2 +- .../components/states/work_in_progress.vue | 13 +- .../vue_merge_request_widget/index.js | 7 +- .../store/modules/sast/actions.js | 24 +++ .../store/modules/sast/index.js | 10 + .../store/modules/sast/mutation_types.js | 4 + .../store/modules/sast/mutations.js | 31 +++ .../store/modules/sast/state.js | 16 ++ .../security_reports/store/utils.js | 70 ++++++ app/helpers/stat_anchors_helper.rb | 24 +++ app/models/ci/bridge.rb | 6 +- app/models/ci/build.rb | 18 -- app/models/ci/processable.rb | 20 ++ app/presenters/project_presenter.rb | 6 +- app/views/layouts/project.html.haml | 1 + app/views/projects/_home_panel.html.haml | 12 +- .../projects/_stat_anchor_list.html.haml | 2 +- ...46-fj-add-structured-data-for-projects.yml | 5 + .../development/approval_suggestions.yml | 6 +- .../development/async_commit_diff_files.yml | 6 +- .../auto_devops_banner_disabled.yml | 4 +- .../branch_list_keyset_pagination.yml | 6 +- .../development/bulk_update_health_status.yml | 4 +- .../ci_bridge_dependency_variables.yml | 7 + .../development/ci_jwt_signing_key.yml | 2 +- .../ci_store_pipeline_messages.yml | 4 +- .../default_merge_ref_for_diffs.yml | 2 +- .../feature_flags_legacy_read_only.yml | 4 +- .../force_autodevops_on_by_default.yml | 6 +- .../development/grape_gitlab_json.yml | 6 +- .../development/graphql_logging.yml | 4 +- ...ide_jump_to_next_unresolved_in_threads.yml | 6 +- .../feature_flags/development/lfs_check.yml | 4 +- ...e_red_head_comments_position_on_demand.yml | 6 +- .../development/merge_ref_auto_sync.yml | 6 +- .../development/merge_ref_auto_sync_lock.yml | 6 +- .../remove_legacy_github_client.yml | 4 +- .../development/remove_resolve_note.yml | 4 +- .../development/rugged_commit_tree_entry.yml | 6 +- .../rugged_list_commits_by_oid.yml | 6 +- .../development/snippets_binary_blob.yml | 4 +- .../development/squash_options.yml | 6 +- .../development/sse_image_uploads.yml | 6 +- config/feature_flags/development/webauthn.yml | 6 +- ...b_sidekiq_enable_semi_reliable_fetcher.yml | 6 +- doc/administration/audit_events.md | 2 + .../img/OneLogin-encryption.png | Bin 9980 -> 0 bytes .../img/github_omniauth.png | Bin 29022 -> 0 bytes .../img/github_push_webhook.png | Bin 45725 -> 0 bytes ...ge_request_pipelines_doubled_MR_v12_09.png | Bin 29650 -> 0 bytes ...equest_pipelines_doubled_branch_v12_09.png | Bin 29680 -> 0 bytes .../img/merge_request_pipeline_config.png | Bin 5296 -> 0 bytes .../img/merge_train_config_v12_0.png | Bin 9012 -> 0 bytes .../img/merge_train_immediate_merge.png | Bin 13038 -> 0 bytes doc/ci/runners/img/shared_runners_admin.png | Bin 29192 -> 0 bytes doc/development/fe_guide/img/gl-modal.png | Bin 8767 -> 0 bytes doc/development/geo/framework.md | 104 +++++---- .../img/fork_choose_namespace.png | Bin 13674 -> 0 bytes doc/gitlab-basics/img/fork_new.png | Bin 10572 -> 0 bytes doc/gitlab-basics/img/merge_request_page.png | Bin 33801 -> 0 bytes .../img/merge_request_select_branch.png | Bin 16654 -> 0 bytes doc/gitlab-basics/img/project_clone_url.png | Bin 14978 -> 0 bytes .../img/jira_dev_panel_jira_setup_1.png | Bin 29546 -> 0 bytes .../img/alert_detail_full_v13_1.png | Bin 26957 -> 0 bytes .../img/alert_detail_overview_v13_1.png | Bin 14827 -> 0 bytes .../img/alert_detail_system_notes_v13_1.png | Bin 22329 -> 0 bytes .../img/alert_list_search_v13_1.png | Bin 12166 -> 0 bytes .../img/alert_list_sort_v13_1.png | Bin 13919 -> 0 bytes .../img/incident_highlight_bar_v13_5.png | Bin 36177 -> 0 bytes .../incident_management/img/incident_list.png | Bin 34194 -> 0 bytes .../img/incident_list_search_v13_3.png | Bin 29780 -> 0 bytes .../img/incident_sla_settings_v13_5.png | Bin 21480 -> 0 bytes doc/subscriptions/img/additional_minutes.png | Bin 12668 -> 0 bytes doc/subscriptions/img/buy_btn.png | Bin 10917 -> 0 bytes doc/subscriptions/img/buy_minutes_card.png | Bin 11875 -> 0 bytes .../img/autodevops_multiple_clusters.png | Bin 12619 -> 0 bytes doc/topics/git/git_rebase.md | 2 +- .../dast/img/dast_on_demand_v13_2.png | Bin 26144 -> 0 bytes .../img/dependency_list_v12_3.png | Bin 156081 -> 0 bytes .../img/dependency_list_v12_4.png | Bin 137591 -> 0 bytes .../img/security_configuration_page_v13_2.png | Bin 51691 -> 0 bytes .../img/vulnerability_solution.png | Bin 9750 -> 0 bytes ...up_security_dashboard_export_csv_v13_1.png | Bin 42309 -> 0 bytes ...t_security_dashboard_export_csv_v12_10.png | Bin 9766 -> 0 bytes ...ility_page_download_patch_button_v13_1.png | Bin 8979 -> 0 bytes .../license_compliance_add_license_v13_0.png | Bin 21244 -> 0 bytes .../license_compliance_pipeline_tab_v13_0.png | Bin 18910 -> 0 bytes .../img/license_compliance_search_v13_0.png | Bin 10686 -> 0 bytes .../img/license_compliance_settings_v13_0.png | Bin 6763 -> 0 bytes .../discussions/img/discussions_resolved.png | Bin 4152 -> 0 bytes .../discussions/img/mr_review_unresolve2.png | Bin 8971 -> 0 bytes .../img/new_issue_for_discussion.png | Bin 11324 -> 0 bytes ..._merge_if_all_discussions_are_resolved.png | Bin 17888 -> 0 bytes ...ge_if_all_discussions_are_resolved_msg.png | Bin 4944 -> 0 bytes .../img/preview_issue_for_discussion.png | Bin 26965 -> 0 bytes .../img/preview_issue_for_discussions.png | Bin 35211 -> 0 bytes .../img/resolve_discussion_button.png | Bin 4683 -> 0 bytes .../img/resolve_discussion_issue_notice.png | Bin 4186 -> 0 bytes .../img/resolve_discussion_open_issue.png | Bin 7514 -> 0 bytes .../img/group_dependency_proxy.png | Bin 40162 -> 0 bytes .../img/unordered_check_list_render_gfm.png | Bin 2781 -> 0 bytes .../img/terraform_plan_widget_v13_0.png | Bin 10986 -> 0 bytes doc/user/infrastructure/index.md | 2 + .../img/project_id_v13_5.png | Bin 9264 -> 0 bytes doc/user/packages/go_proxy/index.md | 149 +++++++------ .../img/unknown_sign_in_email_v13_0.png | Bin 20047 -> 0 bytes .../import_issues_from_jira_form_v12_10.png | Bin 31679 -> 0 bytes .../img/jira_create_new_group_name.png | Bin 5168 -> 0 bytes ...e_metrics_user_starred_dashboard_v13_0.png | Bin 14922 -> 0 bytes .../img/webex_teams_configuration.png | Bin 75327 -> 0 bytes .../issues/img/closing_and_related_issues.png | Bin 6395 -> 0 bytes .../issues/img/delete_single_design_v12_4.png | Bin 921627 -> 0 bytes .../design_drag_and_drop_uploads_v12_9.png | Bin 245564 -> 0 bytes .../issues/img/design_management_v12_3.png | Bin 91233 -> 0 bytes .../img/epic_tree_health_status_v12_10.png | Bin 38018 -> 0 bytes .../issues/img/issue_health_status_v12_10.png | Bin 12185 -> 0 bytes .../issues/img/issue_health_status_v12_9.png | Bin 10509 -> 0 bytes ...ine_succeeds_only_if_succeeds_settings.png | Bin 7433 -> 0 bytes .../operations/img/alert_issue_v13_1.png | Bin 38546 -> 0 bytes .../operations/img/error_details_v12_5.png | Bin 148683 -> 0 bytes .../operations/img/error_details_v12_6.png | Bin 47553 -> 0 bytes .../img/error_details_with_issue_v12_6.png | Bin 50767 -> 0 bytes .../img/error_details_with_issue_v12_7.png | Bin 80625 -> 0 bytes .../img/feature_flags_list_v12_7.png | Bin 7124 -> 0 bytes .../operations/img/specs_list_v12_6.png | Bin 28297 -> 0 bytes .../packages/img/maven_package_view.png | Bin 16105 -> 0 bytes .../project/packages/img/npm_package_view.png | Bin 10349 -> 0 bytes doc/user/project/pages/img/icons/click.png | Bin 4683 -> 0 bytes doc/user/project/pages/img/icons/cogs.png | Bin 4425 -> 0 bytes doc/user/project/pages/img/icons/fork.png | Bin 4380 -> 0 bytes doc/user/project/pages/img/icons/free.png | Bin 3563 -> 0 bytes doc/user/project/pages/img/icons/monitor.png | Bin 1982 -> 0 bytes .../pages/img/pages_workflow_v12_5.png | Bin 29541 -> 0 bytes .../releases/img/edit_release_page_v12_10.png | Bin 85295 -> 0 bytes .../releases/img/edit_release_page_v12_6.png | Bin 44412 -> 0 bytes .../img/release_with_milestone_v12_5.png | Bin 20197 -> 0 bytes doc/user/project/releases/img/releases.png | Bin 43776 -> 0 bytes .../releases/img/releases_count_v12_8.png | Bin 27622 -> 0 bytes doc/user/search/img/issue_search_filter.png | Bin 27091 -> 0 bytes package.json | 2 +- ...variables_to_downstream_via_bridge_spec.rb | 111 ++++++++++ scripts/lint-doc.sh | 14 +- .../projects/show/schema_markup_spec.rb | 23 ++ .../preview/__snapshots__/index_spec.js.snap | 1 + .../store/modules/sast/actions_spec.js | 203 ++++++++++++++++++ .../store/modules/sast/mutations_spec.js | 84 ++++++++ spec/helpers/stat_anchors_helper_spec.rb | 53 +++++ spec/models/ci/bridge_spec.rb | 60 ++++++ yarn.lock | 8 +- 152 files changed, 992 insertions(+), 245 deletions(-) create mode 100644 app/assets/javascripts/vue_shared/security_reports/store/modules/sast/actions.js create mode 100644 app/assets/javascripts/vue_shared/security_reports/store/modules/sast/index.js create mode 100644 app/assets/javascripts/vue_shared/security_reports/store/modules/sast/mutation_types.js create mode 100644 app/assets/javascripts/vue_shared/security_reports/store/modules/sast/mutations.js create mode 100644 app/assets/javascripts/vue_shared/security_reports/store/modules/sast/state.js create mode 100644 app/assets/javascripts/vue_shared/security_reports/store/utils.js create mode 100644 app/helpers/stat_anchors_helper.rb create mode 100644 changelogs/unreleased/36846-fj-add-structured-data-for-projects.yml create mode 100644 config/feature_flags/development/ci_bridge_dependency_variables.yml delete mode 100644 doc/administration/troubleshooting/img/OneLogin-encryption.png delete mode 100644 doc/ci/ci_cd_for_external_repos/img/github_omniauth.png delete mode 100644 doc/ci/ci_cd_for_external_repos/img/github_push_webhook.png delete mode 100644 doc/ci/merge_request_pipelines/img/merge_request_pipelines_doubled_MR_v12_09.png delete mode 100644 doc/ci/merge_request_pipelines/img/merge_request_pipelines_doubled_branch_v12_09.png delete mode 100644 doc/ci/merge_request_pipelines/pipelines_for_merged_results/img/merge_request_pipeline_config.png delete mode 100644 doc/ci/merge_request_pipelines/pipelines_for_merged_results/merge_trains/img/merge_train_config_v12_0.png delete mode 100644 doc/ci/merge_request_pipelines/pipelines_for_merged_results/merge_trains/img/merge_train_immediate_merge.png delete mode 100644 doc/ci/runners/img/shared_runners_admin.png delete mode 100644 doc/development/fe_guide/img/gl-modal.png delete mode 100644 doc/gitlab-basics/img/fork_choose_namespace.png delete mode 100644 doc/gitlab-basics/img/fork_new.png delete mode 100644 doc/gitlab-basics/img/merge_request_page.png delete mode 100644 doc/gitlab-basics/img/merge_request_select_branch.png delete mode 100644 doc/gitlab-basics/img/project_clone_url.png delete mode 100644 doc/integration/img/jira_dev_panel_jira_setup_1.png delete mode 100644 doc/operations/incident_management/img/alert_detail_full_v13_1.png delete mode 100644 doc/operations/incident_management/img/alert_detail_overview_v13_1.png delete mode 100644 doc/operations/incident_management/img/alert_detail_system_notes_v13_1.png delete mode 100644 doc/operations/incident_management/img/alert_list_search_v13_1.png delete mode 100644 doc/operations/incident_management/img/alert_list_sort_v13_1.png delete mode 100644 doc/operations/incident_management/img/incident_highlight_bar_v13_5.png delete mode 100644 doc/operations/incident_management/img/incident_list.png delete mode 100644 doc/operations/incident_management/img/incident_list_search_v13_3.png delete mode 100644 doc/operations/incident_management/img/incident_sla_settings_v13_5.png delete mode 100644 doc/subscriptions/img/additional_minutes.png delete mode 100644 doc/subscriptions/img/buy_btn.png delete mode 100644 doc/subscriptions/img/buy_minutes_card.png delete mode 100644 doc/topics/autodevops/img/autodevops_multiple_clusters.png delete mode 100644 doc/user/application_security/dast/img/dast_on_demand_v13_2.png delete mode 100644 doc/user/application_security/dependency_list/img/dependency_list_v12_3.png delete mode 100644 doc/user/application_security/dependency_list/img/dependency_list_v12_4.png delete mode 100644 doc/user/application_security/img/security_configuration_page_v13_2.png delete mode 100644 doc/user/application_security/img/vulnerability_solution.png delete mode 100644 doc/user/application_security/security_dashboard/img/group_security_dashboard_export_csv_v13_1.png delete mode 100644 doc/user/application_security/security_dashboard/img/project_security_dashboard_export_csv_v12_10.png delete mode 100644 doc/user/application_security/vulnerabilities/img/vulnerability_page_download_patch_button_v13_1.png delete mode 100644 doc/user/compliance/license_compliance/img/license_compliance_add_license_v13_0.png delete mode 100644 doc/user/compliance/license_compliance/img/license_compliance_pipeline_tab_v13_0.png delete mode 100644 doc/user/compliance/license_compliance/img/license_compliance_search_v13_0.png delete mode 100644 doc/user/compliance/license_compliance/img/license_compliance_settings_v13_0.png delete mode 100644 doc/user/discussions/img/discussions_resolved.png delete mode 100644 doc/user/discussions/img/mr_review_unresolve2.png delete mode 100644 doc/user/discussions/img/new_issue_for_discussion.png delete mode 100644 doc/user/discussions/img/only_allow_merge_if_all_discussions_are_resolved.png delete mode 100644 doc/user/discussions/img/only_allow_merge_if_all_discussions_are_resolved_msg.png delete mode 100644 doc/user/discussions/img/preview_issue_for_discussion.png delete mode 100644 doc/user/discussions/img/preview_issue_for_discussions.png delete mode 100644 doc/user/discussions/img/resolve_discussion_button.png delete mode 100644 doc/user/discussions/img/resolve_discussion_issue_notice.png delete mode 100644 doc/user/discussions/img/resolve_discussion_open_issue.png delete mode 100644 doc/user/group/dependency_proxy/img/group_dependency_proxy.png delete mode 100644 doc/user/img/unordered_check_list_render_gfm.png delete mode 100644 doc/user/infrastructure/img/terraform_plan_widget_v13_0.png delete mode 100644 doc/user/packages/composer_repository/img/project_id_v13_5.png delete mode 100644 doc/user/profile/img/unknown_sign_in_email_v13_0.png delete mode 100644 doc/user/project/import/img/jira/import_issues_from_jira_form_v12_10.png delete mode 100644 doc/user/project/integrations/img/jira_create_new_group_name.png delete mode 100644 doc/user/project/integrations/img/toggle_metrics_user_starred_dashboard_v13_0.png delete mode 100644 doc/user/project/integrations/img/webex_teams_configuration.png delete mode 100644 doc/user/project/issues/img/closing_and_related_issues.png delete mode 100644 doc/user/project/issues/img/delete_single_design_v12_4.png delete mode 100644 doc/user/project/issues/img/design_drag_and_drop_uploads_v12_9.png delete mode 100644 doc/user/project/issues/img/design_management_v12_3.png delete mode 100644 doc/user/project/issues/img/epic_tree_health_status_v12_10.png delete mode 100644 doc/user/project/issues/img/issue_health_status_v12_10.png delete mode 100644 doc/user/project/issues/img/issue_health_status_v12_9.png delete mode 100644 doc/user/project/merge_requests/img/merge_when_pipeline_succeeds_only_if_succeeds_settings.png delete mode 100644 doc/user/project/operations/img/alert_issue_v13_1.png delete mode 100644 doc/user/project/operations/img/error_details_v12_5.png delete mode 100644 doc/user/project/operations/img/error_details_v12_6.png delete mode 100644 doc/user/project/operations/img/error_details_with_issue_v12_6.png delete mode 100644 doc/user/project/operations/img/error_details_with_issue_v12_7.png delete mode 100644 doc/user/project/operations/img/feature_flags_list_v12_7.png delete mode 100644 doc/user/project/operations/img/specs_list_v12_6.png delete mode 100644 doc/user/project/packages/img/maven_package_view.png delete mode 100644 doc/user/project/packages/img/npm_package_view.png delete mode 100644 doc/user/project/pages/img/icons/click.png delete mode 100644 doc/user/project/pages/img/icons/cogs.png delete mode 100644 doc/user/project/pages/img/icons/fork.png delete mode 100644 doc/user/project/pages/img/icons/free.png delete mode 100644 doc/user/project/pages/img/icons/monitor.png delete mode 100644 doc/user/project/pages/img/pages_workflow_v12_5.png delete mode 100644 doc/user/project/releases/img/edit_release_page_v12_10.png delete mode 100644 doc/user/project/releases/img/edit_release_page_v12_6.png delete mode 100644 doc/user/project/releases/img/release_with_milestone_v12_5.png delete mode 100644 doc/user/project/releases/img/releases.png delete mode 100644 doc/user/project/releases/img/releases_count_v12_8.png delete mode 100644 doc/user/search/img/issue_search_filter.png create mode 100644 qa/qa/specs/features/browser_ui/4_verify/pipeline/pass_dotenv_variables_to_downstream_via_bridge_spec.rb create mode 100644 spec/features/projects/show/schema_markup_spec.rb create mode 100644 spec/frontend/vue_shared/security_reports/store/modules/sast/actions_spec.js create mode 100644 spec/frontend/vue_shared/security_reports/store/modules/sast/mutations_spec.js create mode 100644 spec/helpers/stat_anchors_helper_spec.rb diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index ebab7e45a64..920d7f9bf9c 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -c6ba78e87bed03254417fe4cd52d377d88ac0b60 +0926b9f8ff2215874eef0e22f750a74da5fe4321 diff --git a/Gemfile b/Gemfile index 04e78f33d22..e4ddff2a803 100644 --- a/Gemfile +++ b/Gemfile @@ -372,7 +372,7 @@ group :development, :test do gem 'gitlab-styles', '~> 5.0.0', require: false - gem 'scss_lint', '~> 0.56.0', require: false + gem 'scss_lint', '~> 0.59.0', require: false gem 'haml_lint', '~> 0.36.0', require: false gem 'bundler-audit', '~> 0.6.1', require: false diff --git a/Gemfile.lock b/Gemfile.lock index 3b26093b11d..271c1950ca1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1081,9 +1081,8 @@ GEM sawyer (0.8.2) addressable (>= 2.3.5) faraday (> 0.8, < 2.0) - scss_lint (0.56.0) - rake (>= 0.9, < 13) - sass (~> 3.5.3) + scss_lint (0.59.0) + sass (~> 3.5, >= 3.5.5) securecompare (1.0.0) seed-fu (2.3.7) activerecord (>= 3.1) @@ -1484,7 +1483,7 @@ DEPENDENCIES rugged (~> 0.28) sanitize (~> 5.2.1) sassc-rails (~> 2.1.0) - scss_lint (~> 0.56.0) + scss_lint (~> 0.59.0) seed-fu (~> 2.3.7) selenium-webdriver (~> 3.142) sentry-raven (~> 3.0) diff --git a/app/assets/javascripts/repository/components/preview/index.vue b/app/assets/javascripts/repository/components/preview/index.vue index 4e2c8332f37..c9c5aa37645 100644 --- a/app/assets/javascripts/repository/components/preview/index.vue +++ b/app/assets/javascripts/repository/components/preview/index.vue @@ -58,7 +58,7 @@ export default { -
+
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/work_in_progress.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/work_in_progress.vue index e12682b0a49..1d591168a17 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/work_in_progress.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/work_in_progress.vue @@ -1,6 +1,7 @@