From 2c49951e8c1f4fb95d15cac3dd0677d6882d2add Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 26 Aug 2020 09:10:16 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .eslintrc.yml | 2 +- .scss-lint.yml | 2 +- .../components/alert_details.vue | 1 + .../components/alert_management_table.vue | 1 + .../components/system_notes/system_note.vue | 1 + .../badges/components/badge_form.vue | 1 + .../batch_comments/components/draft_note.vue | 1 + .../batch_comments/components/review_bar.vue | 1 + .../components/popover.vue | 1 + app/assets/javascripts/blob/utils.js | 3 - .../boards/components/modal/empty_state.vue | 1 + .../remove_cluster_confirmation.vue | 1 + ...install_application_confirmation_modal.vue | 1 + .../update_application_confirmation_modal.vue | 1 + .../eks_cluster_configuration_form.vue | 1 + .../components/service_credentials_form.vue | 1 + .../cycle_analytics/components/banner.vue | 1 + .../components/stage_staging_component.vue | 1 + .../components/stage_test_component.vue | 1 + .../components/design_notes/design_note.vue | 1 + .../components/design_notes/design_note.vue | 1 + .../diffs/components/commit_item.vue | 1 + .../diffs/components/diff_file.vue | 1 + .../diffs/components/diff_file_header.vue | 1 + .../components/inline_diff_table_row.vue | 1 + .../diffs/components/no_changes.vue | 1 + .../components/parallel_diff_table_row.vue | 1 + app/assets/javascripts/editor/constants.js | 7 + app/assets/javascripts/editor/editor_lite.js | 89 +- .../javascripts/editor/editor_markdown_ext.js | 14 +- .../components/confirm_rollback_modal.vue | 1 + .../components/stop_environment_modal.vue | 2 +- .../components/stacktrace_entry.vue | 1 + .../components/frequent_items_list_item.vue | 2 +- .../groups/components/group_item.vue | 1 + .../ide/components/commit_sidebar/actions.vue | 1 + .../commit_sidebar/success_message.vue | 1 + .../ide/components/error_message.vue | 1 + .../ide/components/jobs/detail.vue | 1 + .../ide/components/pipelines/list.vue | 1 + .../ide/components/terminal/empty_state.vue | 1 + .../edit/components/dynamic_field.vue | 1 + .../issuables_list/components/issuable.vue | 1 + .../issue_show/components/description.vue | 1 + .../issue_show/components/locked_warning.vue | 1 + .../issue_show/components/title.vue | 1 + .../javascripts/jobs/components/job_app.vue | 1 + .../jobs/components/job_log_controllers.vue | 1 + .../jobs/components/manual_variables_form.vue | 1 + .../components/charts/empty_chart.vue | 1 + .../components/group_empty_state.vue | 1 + .../javascripts/notebook/cells/markdown.vue | 1 + .../notebook/cells/output/html.vue | 1 + .../components/diff_discussion_header.vue | 1 + .../notes/components/diff_with_note.vue | 1 + .../components/discussion_filter_note.vue | 1 + .../notes/components/note_body.vue | 1 + .../notes/components/note_form.vue | 1 + .../notes/components/note_header.vue | 1 + .../components/note_signed_out_widget.vue | 1 + .../notes/components/noteable_note.vue | 1 + .../index/components/delete_project_modal.vue | 1 + .../users/components/delete_user_modal.vue | 1 + .../user_operation_confirmation_modal.vue | 1 + .../components/delete_milestone_modal.vue | 1 + .../new/components/fork_groups_list_item.vue | 1 + .../components/pipeline_schedules_callout.vue | 1 + .../components/performance_bar_app.vue | 1 + .../components/request_selector.vue | 1 + .../components/request_warning.vue | 1 + .../pipelines_list/pipeline_stop_modal.vue | 1 + .../components/pipelines_list/time_ago.vue | 1 + .../components/delete_account_modal.vue | 1 + .../account/components/update_username.vue | 1 + .../components/app.vue | 1 + .../components/welcome.vue | 1 + .../components/reset_key.vue | 1 + .../components/registry_breadcrumb.vue | 1 + .../releases/components/app_edit_new.vue | 1 + .../releases/components/release_block.vue | 1 + .../repository/components/last_commit.vue | 1 + .../repository/components/preview/index.vue | 1 + .../repository/components/table/row.vue | 1 + .../components/self_monitor_form.vue | 1 + .../serverless/components/functions.vue | 1 + .../set_status_modal_wrapper.vue | 1 + .../components/time_tracking/help_state.vue | 1 + .../time_tracking/spent_only_pane.vue | 1 + .../components/snippet_description_view.vue | 1 + .../services/parse_source_file.js | 13 +- .../components/deployment/memory_usage.vue | 1 + .../components/mr_widget_header.vue | 1 + .../components/mr_widget_pipeline.vue | 2 +- .../components/mr_widget_related_links.vue | 1 + .../components/states/commits_header.vue | 1 + .../components/states/mr_widget_rebase.vue | 1 + .../components/states/nothing_to_merge.vue | 1 + .../components/states/ready_to_merge.vue | 1 + .../vue_shared/components/awards_list.vue | 1 + .../components/blob_viewers/rich_viewer.vue | 1 + .../components/blob_viewers/simple_viewer.vue | 1 + .../viewers/markdown_viewer.vue | 1 + .../components/dismissible_alert.vue | 1 + .../components/header_ci_component.vue | 1 + .../issue/related_issuable_item.vue | 1 + .../vue_shared/components/markdown/field.vue | 1 + .../markdown/suggestion_diff_row.vue | 1 + .../components/markdown/suggestions.vue | 1 + .../components/notes/noteable_warning.vue | 1 + .../components/notes/system_note.vue | 1 + .../project_selector/project_list_item.vue | 1 + .../vue_shared/components/recaptcha_modal.vue | 1 + .../components/user_popover/user_popover.vue | 1 + .../stylesheets/startup/startup-dark.scss | 1912 +++++++++++++ .../stylesheets/startup/startup-general.scss | 1911 ++++++++++++- .../stylesheets/startup/startup-signin.scss | 2409 +++++++++++++++++ .../resolvers/issue_status_counts_resolver.rb | 14 + app/helpers/application_helper.rb | 4 +- app/views/dashboard/projects/index.html.haml | 2 +- app/views/layouts/_startup_css.haml | 4 +- app/views/projects/commits/_commit.html.haml | 3 +- app/views/search/results/_blob_data.html.haml | 2 +- app/views/search/results/_commit.html.haml | 2 +- app/views/search/results/_issue.html.haml | 2 +- .../search/results/_merge_request.html.haml | 2 +- app/views/search/results/_milestone.html.haml | 2 +- app/views/search/results/_note.html.haml | 2 +- ...38569-fix-issuable-count-scope-graphql.yml | 5 + doc/development/changelog.md | 5 + doc/development/documentation/styleguide.md | 10 +- doc/development/pipelines.md | 62 +- doc/operations/incident_management/index.md | 2 +- doc/topics/git/lfs/index.md | 66 +- ...nstance_security_dashboard_empty_v13_3.png | Bin 0 -> 19880 bytes ...ce_security_dashboard_export_csv_v13_0.png | Bin 5563 -> 0 bytes .../security_dashboard/index.md | 6 +- doc/user/permissions.md | 2 +- doc/user/project/file_lock.md | 242 +- .../file_lock_merge_request_error_message.png | Bin 8219 -> 0 bytes .../project/img/file_lock_repository_view.png | Bin 9805 -> 0 bytes .../project/img/lfs_locked_files_v13_2.png | Bin 0 -> 21405 bytes lib/gitlab/alert_management/payload/base.rb | 15 +- .../alert_management/payload/generic.rb | 1 + .../alert_management/payload/prometheus.rb | 8 - locale/gitlab.pot | 57 +- package.json | 2 +- .../components/alert_metrics_spec.js | 9 +- .../alert_managment_sidebar_assignees_spec.js | 17 +- .../components/board_list_header_spec.js | 2 +- .../design_notes/design_discussion_spec.js | 2 +- .../design_notes/design_discussion_spec.js | 2 +- spec/frontend/editor/editor_lite_spec.js | 194 +- .../editor/editor_markdown_ext_spec.js | 50 +- .../logs/components/environment_logs_spec.js | 24 +- .../components/log_advanced_filters_spec.js | 2 +- .../components/log_control_buttons_spec.js | 2 +- .../components/log_simple_filters_spec.js | 2 +- .../components/charts/anomaly_spec.js | 3 +- .../monitoring/components/charts/bar_spec.js | 4 - .../components/charts/column_spec.js | 4 - .../components/charts/heatmap_spec.js | 7 - .../components/charts/time_series_spec.js | 3 +- .../components/dashboard_panel_spec.js | 6 - .../monitoring/components/dashboard_spec.js | 5 +- .../components/discussion_counter_spec.js | 9 +- .../list/components/packages_list_spec.js | 2 +- .../project_feature_settings_spec.js | 4 +- .../pipelines_filtered_search_spec.js | 2 +- .../services/parse_source_file_spec.js | 38 +- .../user_avatar/user_avatar_link_spec.js | 4 - .../issue_status_counts_resolver_spec.rb | 35 +- .../alert_management/payload/base_spec.rb | 53 +- .../alert_management/payload/generic_spec.rb | 6 + spec/views/search/_results.html.haml_spec.rb | 31 +- 174 files changed, 7111 insertions(+), 404 deletions(-) create mode 100644 app/assets/javascripts/editor/constants.js create mode 100644 app/assets/stylesheets/startup/startup-dark.scss create mode 100644 app/assets/stylesheets/startup/startup-signin.scss create mode 100644 changelogs/unreleased/238569-fix-issuable-count-scope-graphql.yml create mode 100644 doc/user/application_security/security_dashboard/img/instance_security_dashboard_empty_v13_3.png delete mode 100644 doc/user/application_security/security_dashboard/img/instance_security_dashboard_export_csv_v13_0.png delete mode 100644 doc/user/project/img/file_lock_merge_request_error_message.png delete mode 100644 doc/user/project/img/file_lock_repository_view.png create mode 100644 doc/user/project/img/lfs_locked_files_v13_2.png diff --git a/.eslintrc.yml b/.eslintrc.yml index 2b8592fd285..b8683ba803f 100644 --- a/.eslintrc.yml +++ b/.eslintrc.yml @@ -36,7 +36,7 @@ rules: # Disabled for now, to make the plugin-vue 4.5 -> 5.0 update smoother vue/no-confusing-v-for-v-if: error vue/no-use-v-if-with-v-for: off - vue/no-v-html: off + vue/no-v-html: error vue/use-v-on-exact: off # all offenses of no-jquery/no-animate-toggle are false positives ( $toast.show() ) no-jquery/no-animate-toggle: off diff --git a/.scss-lint.yml b/.scss-lint.yml index 9b3fc388756..420b15274bb 100644 --- a/.scss-lint.yml +++ b/.scss-lint.yml @@ -7,7 +7,7 @@ scss_files: exclude: - 'app/assets/stylesheets/pages/emojis.scss' - - 'app/assets/stylesheets/startup/startup-general.scss' + - 'app/assets/stylesheets/startup/startup-*.scss' linters: # Reports when you use improper spacing around ! (the "bang") in !default, diff --git a/app/assets/javascripts/alert_management/components/alert_details.vue b/app/assets/javascripts/alert_management/components/alert_details.vue index 5d260fcc200..b54d39e67d4 100644 --- a/app/assets/javascripts/alert_management/components/alert_details.vue +++ b/app/assets/javascripts/alert_management/components/alert_details.vue @@ -1,4 +1,5 @@