From 31a340adabe75f8b02cca462ab8aa857ff62f772 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 15 May 2020 18:07:52 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- CHANGELOG.md | 18 - .../components/alert_management_list.vue | 13 +- .../ide/components/commit_sidebar/form.vue | 37 +- .../ide/components/repo_commit_section.vue | 21 - .../ide/stores/modules/commit/actions.js | 36 +- .../secondary_navigation_elements.scss | 10 +- app/assets/stylesheets/pages/alerts_list.scss | 27 +- app/controllers/application_controller.rb | 33 +- app/controllers/jwt_controller.rb | 10 +- .../projects/alert_management_controller.rb | 7 - .../projects/artifacts_controller.rb | 13 +- app/helpers/workhorse_helper.rb | 4 +- app/models/ci/job_artifact.rb | 2 +- app/models/issue.rb | 2 + app/models/service.rb | 4 + app/views/projects/new.html.haml | 2 +- app/views/projects/services/_form.html.haml | 2 +- app/views/shared/_group_form.html.haml | 4 +- app/views/shared/_milestone_expired.html.haml | 6 +- .../shared/integrations/_index.html.haml | 2 +- ...defined-method-pages_domain-for-pagesd.yml | 5 + ...rrayconnection-can-return-incorrect-nu.yml | 5 + ...970-add-instance-to-service-if-missing.yml | 5 + ...e-with-nil-secret-in-the-db-are-broken.yml | 5 + ...---app-views-shared-_group_form-html-h.yml | 5 + .../unreleased/ab-north-star-usage-ping-2.yml | 5 + ...at-duplicate-ci-pipelines-index-215790.yml | 5 + .../fix-started-guide-link-201724.yml | 5 + .../id-fetch-raw-artifact-of-any-type.yml | 5 + .../show_unpersisted_services_not_active.yml | 5 + .../tr-remove-alert-detail-feature-flag.yml | 5 + ...0_add_project_show_default_award_emojis.rb | 2 +- doc/README.md | 2 +- doc/administration/geo/replication/index.md | 2 +- .../high_availability/load_balancer.md | 2 +- doc/administration/index.md | 2 +- doc/administration/integration/terminal.md | 2 +- doc/api/feature_flag_specs.md | 12 +- doc/api/feature_flags.md | 2 +- doc/api/features.md | 2 + doc/api/merge_request_approvals.md | 2 +- doc/api/releases/index.md | 16 +- doc/api/templates/gitignores.md | 2 +- doc/ci/README.md | 2 +- doc/ci/environments.md | 986 +---------------- doc/ci/environments/index.md | 988 ++++++++++++++++++ doc/ci/environments/protected_environments.md | 2 +- .../index.md | 2 +- .../laravel_with_gitlab_and_envoy/index.md | 2 +- doc/ci/introduction/index.md | 4 +- doc/ci/pipelines/img/pipelines_index.png | Bin 14896 -> 0 bytes .../pipelines/img/pipelines_index_v13_0.png | Bin 0 -> 46101 bytes doc/ci/pipelines/index.md | 14 +- doc/ci/pipelines/job_artifacts.md | 2 +- doc/ci/review_apps/index.md | 12 +- doc/ci/variables/README.md | 6 +- doc/ci/yaml/README.md | 10 +- doc/development/fe_guide/tooling.md | 4 +- doc/development/logging.md | 2 + doc/development/testing_guide/review_apps.md | 4 +- doc/integration/azure.md | 2 +- doc/raketasks/backup_restore.md | 2 +- doc/topics/autodevops/customize.md | 6 +- doc/topics/autodevops/quick_start_guide.md | 6 +- doc/topics/autodevops/stages.md | 4 +- doc/topics/autodevops/upgrading_postgresql.md | 4 +- doc/topics/gitlab_flow.md | 2 +- doc/university/training/end-user/README.md | 2 +- doc/update/restore_after_failure.md | 2 +- .../admin_area/settings/usage_statistics.md | 1 + .../dependency_scanning/index.md | 69 +- doc/user/application_security/index.md | 2 +- doc/user/application_security/sast/index.md | 33 +- .../threat_monitoring/index.md | 4 +- doc/user/clusters/applications.md | 2 +- doc/user/clusters/environments.md | 2 +- doc/user/group/clusters/index.md | 4 +- doc/user/group/epics/index.md | 1 + doc/user/group/epics/manage_epics.md | 36 +- doc/user/instance/clusters/index.md | 6 +- doc/user/packages/index.md | 14 +- doc/user/project/clusters/index.md | 12 +- doc/user/project/deploy_boards.md | 10 +- .../prometheus_dashboard_select_v_13_0.png | Bin 0 -> 14284 bytes ...e_metrics_user_starred_dashboard_v13_0.png | Bin 0 -> 14922 bytes doc/user/project/integrations/prometheus.md | 153 ++- .../reviewing_and_managing_merge_requests.md | 2 +- .../project/operations/alert_management.md | 13 + doc/user/project/operations/feature_flags.md | 10 +- .../operations/img/alert_detail_v13_0.png | Bin 0 -> 24097 bytes doc/user/project/operations/index.md | 2 +- .../linking_to_an_external_dashboard.md | 2 +- doc/user/project/repository/file_finder.md | 6 +- lib/api/api.rb | 3 +- lib/api/helpers.rb | 4 +- lib/api/job_artifacts.rb | 4 +- .../grape_logging/loggers/context_logger.rb | 14 + lib/gitlab/lograge/custom_options.rb | 2 + lib/gitlab/usage_data.rb | 1 + lib/gitlab/workhorse.rb | 3 +- lib/support/init.d/gitlab.default.example | 4 +- locale/gitlab.pot | 12 + .../application_controller_spec.rb | 26 +- .../alert_management_controller_spec.rb | 30 +- .../projects/artifacts_controller_spec.rb | 40 +- spec/factories/ci/job_artifacts.rb | 9 +- spec/factories/usage_data.rb | 11 +- spec/fixtures/lsif.json.zip | Bin 0 -> 2178 bytes .../components/alert_management_list_spec.js | 21 +- .../components/commit_sidebar/form_spec.js | 121 +-- ...ec.js => dashboard_resize_browser_spec.js} | 7 + spec/lib/gitlab/application_context_spec.rb | 14 +- .../lib/gitlab/lograge/custom_options_spec.rb | 23 +- spec/lib/gitlab/usage_data_spec.rb | 1 + spec/models/issue_spec.rb | 12 + spec/models/service_spec.rb | 14 + spec/requests/jwt_controller_spec.rb | 1 + 117 files changed, 1822 insertions(+), 1365 deletions(-) create mode 100644 changelogs/unreleased/216728-actionview-template-error-undefined-method-pages_domain-for-pagesd.yml create mode 100644 changelogs/unreleased/216851-graphql-externallypaginatedarrayconnection-can-return-incorrect-nu.yml create mode 100644 changelogs/unreleased/216970-add-instance-to-service-if-missing.yml create mode 100644 changelogs/unreleased/217602-file-uploads-on-local-storage-with-nil-secret-in-the-db-are-broken.yml create mode 100644 changelogs/unreleased/22691-externelize-i18n-strings-from---app-views-shared-_group_form-html-h.yml create mode 100644 changelogs/unreleased/ab-north-star-usage-ping-2.yml create mode 100644 changelogs/unreleased/cat-duplicate-ci-pipelines-index-215790.yml create mode 100644 changelogs/unreleased/fix-started-guide-link-201724.yml create mode 100644 changelogs/unreleased/id-fetch-raw-artifact-of-any-type.yml create mode 100644 changelogs/unreleased/show_unpersisted_services_not_active.yml create mode 100644 changelogs/unreleased/tr-remove-alert-detail-feature-flag.yml create mode 100644 doc/ci/environments/index.md delete mode 100644 doc/ci/pipelines/img/pipelines_index.png create mode 100644 doc/ci/pipelines/img/pipelines_index_v13_0.png create mode 100644 doc/user/project/integrations/img/prometheus_dashboard_select_v_13_0.png create mode 100644 doc/user/project/integrations/img/toggle_metrics_user_starred_dashboard_v13_0.png create mode 100644 doc/user/project/operations/img/alert_detail_v13_0.png create mode 100644 lib/gitlab/grape_logging/loggers/context_logger.rb create mode 100644 spec/fixtures/lsif.json.zip rename spec/javascripts/monitoring/components/{dashboard_resize_spec.js => dashboard_resize_browser_spec.js} (85%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 676a529cbcb..3b0b8ba9c0a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,17 +2,6 @@ documentation](doc/development/changelog.md) for instructions on adding your own entry. -## 12.10.6 (2020-05-15) - -### Fixed (5 changes) - -- Fix duplicate index removal on ci_pipelines.project_id. !31043 -- Fix 500 on creating an invalid domains and verification. !31190 -- Fix incorrect number of errors returned when querying sentry errors. !31252 -- Add instance column to services table if it's missing. !31631 -- Fix incorrect regex used in FileUploader#extract_dynamic_path. !32271 - - ## 12.10.5 (2020-05-13) ### Added (1 change) @@ -502,13 +491,6 @@ entry. - Remove store_mentions! in Snippets::CreateService. !29581 (Sashi Kumar) -## 12.9.7 (2020-05-13) - -### Added (1 change) - -- Consider project group and group ancestors when processing CODEOWNERS entries. !31806 - - ## 12.9.6 (2020-05-05) ### Fixed (1 change) diff --git a/app/assets/javascripts/alert_management/components/alert_management_list.vue b/app/assets/javascripts/alert_management/components/alert_management_list.vue index b9edbb4b0a0..ce1738f1961 100644 --- a/app/assets/javascripts/alert_management/components/alert_management_list.vue +++ b/app/assets/javascripts/alert_management/components/alert_management_list.vue @@ -13,6 +13,7 @@ import { } from '@gitlab/ui'; import createFlash from '~/flash'; import { s__ } from '~/locale'; +import { joinPaths } from '~/lib/utils/url_utility'; import TimeAgo from '~/vue_shared/components/time_ago_tooltip.vue'; import getAlerts from '../graphql/queries/getAlerts.query.graphql'; import { ALERTS_STATUS, ALERTS_STATUS_TABS, ALERTS_SEVERITY_LABELS } from '../constants'; @@ -21,8 +22,11 @@ import updateAlertStatus from '../graphql/mutations/update_alert_status.graphql' import { capitalizeFirstCharacter } from '~/lib/utils/text_utility'; const tdClass = 'table-col d-flex d-md-table-cell align-items-center'; +const bodyTrClass = + 'gl-border-1 gl-border-t-solid gl-border-gray-100 hover-bg-blue-50 hover-gl-cursor-pointer hover-gl-border-b-solid hover-gl-border-blue-200'; export default { + bodyTrClass, i18n: { noAlertsMsg: s__( "AlertManagement|No alerts available to display. If you think you're seeing this message in error, refresh the page.", @@ -62,9 +66,8 @@ export default { { key: 'status', thClass: 'w-15p', - trClass: 'w-15p', label: s__('AlertManagement|Status'), - tdClass: `${tdClass} rounded-bottom text-capitalize`, + tdClass: `${tdClass} rounded-bottom`, }, ], statuses: { @@ -170,6 +173,9 @@ export default { ); }); }, + handleRowClick({ iid }) { + window.location.assign(joinPaths(window.location.pathname, iid, 'details')); + }, }, }; @@ -201,8 +207,9 @@ export default { :fields="$options.fields" :show-empty="true" :busy="loading" - fixed stacked="md" + :tbody-tr-class="$options.bodyTrClass" + @row-clicked="handleRowClick" >