From 807d57c18fdde0d9ba991a2b3b078a74a7472f30 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 25 Mar 2021 06:09:02 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- Gemfile | 2 +- Gemfile.lock | 3 +- .../boards/components/board_blocked_icon.vue | 2 +- .../components/ci_variable_popover.vue | 2 +- .../components/node_error_help_text.vue | 2 +- .../feature_highlight_popover.vue | 1 - .../components/request_selector.vue | 6 +- .../components/request_warning.vue | 2 +- .../components/states/mr_widget_conflicts.vue | 7 +- .../components/states/ready_to_merge.vue | 2 +- .../queries/get_state.query.graphql | 9 +- .../states/ready_to_merge.fragment.graphql | 12 ++- .../stores/mr_widget_store.js | 2 +- .../components/alert_details.vue | 7 +- .../components/alert_sidebar.vue | 5 -- .../alert_details/components/alert_status.vue | 23 ++--- .../components/sidebar/sidebar_status.vue | 24 +++--- .../vue_shared/alert_details/constants.js | 11 +++ .../vue_shared/alert_details/index.js | 1 + .../components/alert_details_table.vue | 8 ++ .../vue_shared/components/help_popover.vue | 2 +- .../components/user_popover/user_popover.vue | 2 +- app/controllers/projects/jobs_controller.rb | 4 +- app/models/ci/build.rb | 2 - app/models/ci/runner.rb | 2 - app/models/deploy_key.rb | 2 - app/uploaders/content_type_whitelist.rb | 2 +- .../unreleased/321891-change-alert-status.yml | 5 ++ ...ion-1226-make-popover-focus-by-default.yml | 5 ++ ...ve-direct-mimemagic-dependency-minimal.yml | 5 ++ .../remove-direct-mimemagic-dependency.yml | 5 ++ doc/api/projects.md | 2 +- doc/ci/jobs/img/collapsible_log_v12_6.png | Bin 96471 -> 0 bytes doc/ci/jobs/img/collapsible_log_v13_10.png | Bin 0 -> 48386 bytes doc/ci/jobs/img/manual_job_variables.png | Bin 39858 -> 0 bytes .../jobs/img/manual_job_variables_v13_10.png | Bin 0 -> 24745 bytes doc/ci/jobs/index.md | 6 +- doc/ci/yaml/gitlab_ci_yaml.md | 2 +- doc/ci/yaml/img/job_running.png | Bin 99621 -> 0 bytes doc/ci/yaml/img/job_running_v13_10.png | Bin 0 -> 57525 bytes .../img/admin_area_settings_button.png | Bin 7974 -> 0 bytes .../settings/continuous_integration.md | 5 +- .../secret_detection/index.md | 40 ++++++--- ...roject_security_dashboard_chart_v13_10.png | Bin 14346 -> 0 bytes ...roject_security_dashboard_chart_v13_11.png | Bin 0 -> 15914 bytes .../security_dashboard/index.md | 3 +- lib/api/generic_packages.rb | 4 +- lib/api/helpers.rb | 11 --- .../packages/dependency_proxy_helpers.rb | 2 +- lib/api/helpers/packages_helpers.rb | 3 +- lib/gitlab/data_builder/build.rb | 1 - lib/gitlab/data_builder/pipeline.rb | 1 - lib/gitlab/utils/mime_type.rb | 25 ++++++ package.json | 2 +- .../user_sees_merge_request_pipelines_spec.rb | 25 ++++++ spec/fixtures/rails_sample.bmp | Bin 0 -> 356502 bytes spec/fixtures/rails_sample.png | Bin 0 -> 85809 bytes spec/fixtures/rails_sample.tif | Bin 0 -> 359036 bytes spec/fixtures/sample.ico | Bin 0 -> 4286 bytes .../feature_highlight_popover_spec.js | 1 - .../packages_list_app_spec.js.snap | 4 +- .../__snapshots__/empty_state_spec.js.snap | 4 +- .../alert_details/alert_details_spec.js | 10 ++- .../alert_details/alert_status_spec.js | 19 ++++ .../sidebar/alert_sidebar_spec.js | 16 ---- .../sidebar/alert_sidebar_status_spec.js | 31 ++++++- .../components/alert_details_table_spec.js | 81 +++++++++++------- .../components/help_popover_spec.js | 4 - .../packages/dependency_proxy_helpers_spec.rb | 10 ++- spec/lib/api/helpers_spec.rb | 14 --- spec/lib/gitlab/data_builder/pipeline_spec.rb | 1 - spec/lib/gitlab/sql/cte_spec.rb | 2 +- spec/lib/gitlab/utils/mime_type_spec.rb | 57 ++++++++++++ .../upload_type_check_shared_context.rb | 3 +- yarn.lock | 12 +-- 75 files changed, 368 insertions(+), 200 deletions(-) create mode 100644 changelogs/unreleased/321891-change-alert-status.yml create mode 100644 changelogs/unreleased/gitlab-ui-integration-1226-make-popover-focus-by-default.yml create mode 100644 changelogs/unreleased/remove-direct-mimemagic-dependency-minimal.yml create mode 100644 changelogs/unreleased/remove-direct-mimemagic-dependency.yml delete mode 100644 doc/ci/jobs/img/collapsible_log_v12_6.png create mode 100644 doc/ci/jobs/img/collapsible_log_v13_10.png delete mode 100644 doc/ci/jobs/img/manual_job_variables.png create mode 100644 doc/ci/jobs/img/manual_job_variables_v13_10.png delete mode 100644 doc/ci/yaml/img/job_running.png create mode 100644 doc/ci/yaml/img/job_running_v13_10.png delete mode 100644 doc/user/admin_area/img/admin_area_settings_button.png delete mode 100644 doc/user/application_security/security_dashboard/img/project_security_dashboard_chart_v13_10.png create mode 100644 doc/user/application_security/security_dashboard/img/project_security_dashboard_chart_v13_11.png create mode 100644 lib/gitlab/utils/mime_type.rb create mode 100644 spec/fixtures/rails_sample.bmp create mode 100644 spec/fixtures/rails_sample.png create mode 100644 spec/fixtures/rails_sample.tif create mode 100644 spec/fixtures/sample.ico create mode 100644 spec/lib/gitlab/utils/mime_type_spec.rb diff --git a/Gemfile b/Gemfile index a64bc0c698b..ddde9293632 100644 --- a/Gemfile +++ b/Gemfile @@ -274,7 +274,7 @@ gem 'licensee', '~> 9.14.1' gem 'charlock_holmes', '~> 0.7.7' # Detect mime content type from content -gem 'mimemagic', '~> 0.3.2' +gem 'ruby-magic-static' # Faster blank gem 'fast_blank' diff --git a/Gemfile.lock b/Gemfile.lock index ca4b0151798..5b98e24686f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1109,6 +1109,7 @@ GEM i18n ruby-fogbugz (0.2.1) crack (~> 0.4) + ruby-magic-static (0.3.0) ruby-prof (1.3.1) ruby-progressbar (1.11.0) ruby-saml (1.7.2) @@ -1481,7 +1482,6 @@ DEPENDENCIES marginalia (~> 1.10.0) memory_profiler (~> 0.9) method_source (~> 1.0) - mimemagic (~> 0.3.2) mini_magick (~> 4.10.1) minitest (~> 5.11.0) multi_json (~> 1.14.1) @@ -1555,6 +1555,7 @@ DEPENDENCIES rspec_junit_formatter rspec_profiling (~> 0.0.6) ruby-fogbugz (~> 0.2.1) + ruby-magic-static ruby-prof (~> 1.3.0) ruby-progressbar (~> 1.10) ruby_parser (~> 3.15) diff --git a/app/assets/javascripts/boards/components/board_blocked_icon.vue b/app/assets/javascripts/boards/components/board_blocked_icon.vue index 0e922a8498a..0f92e714752 100644 --- a/app/assets/javascripts/boards/components/board_blocked_icon.vue +++ b/app/assets/javascripts/boards/components/board_blocked_icon.vue @@ -158,7 +158,7 @@ export default { data-testid="issue-blocked-icon" @mouseenter="handleMouseEnter" /> - + diff --git a/app/assets/javascripts/ci_variable_list/components/ci_variable_popover.vue b/app/assets/javascripts/ci_variable_list/components/ci_variable_popover.vue index 6e6527df63f..605da5d9352 100644 --- a/app/assets/javascripts/ci_variable_list/components/ci_variable_popover.vue +++ b/app/assets/javascripts/ci_variable_list/components/ci_variable_popover.vue @@ -37,7 +37,7 @@ export default { diff --git a/app/assets/javascripts/performance_bar/components/request_warning.vue b/app/assets/javascripts/performance_bar/components/request_warning.vue index b61e1e5b7a9..c74257b176a 100644 --- a/app/assets/javascripts/performance_bar/components/request_warning.vue +++ b/app/assets/javascripts/performance_bar/components/request_warning.vue @@ -37,6 +37,6 @@ export default { diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.vue index 23f415c3116..55e81efece2 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.vue @@ -149,12 +149,7 @@ export default { > {{ s__('mrWidget|Resolve conflicts') }} - +