From 6ff3eb60e3ddbfe7450b760efe57112ddacbdb69 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 9 Jun 2020 15:08:05 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .gitignore | 1 + .../javascripts/boards/stores/boards_store.js | 2 + .../error_tracking/store/list/actions.js | 14 +- .../pipelines/components/dag/dag.vue | 23 +- .../framework/broadcast_messages.scss | 4 - .../workhorse_import_export_upload.rb | 2 +- .../projects/pipelines_controller.rb | 2 +- app/graphql/types/access_level_enum.rb | 15 + app/graphql/types/access_level_type.rb | 17 + app/graphql/types/group_member_type.rb | 17 + app/graphql/types/member_interface.rb | 22 + app/graphql/types/project_member_type.rb | 13 +- app/graphql/types/user_type.rb | 6 + app/helpers/application_settings_helper.rb | 1 + app/models/application_setting.rb | 4 + .../application_setting_implementation.rb | 1 + app/models/ci/instance_variable.rb | 12 + app/models/import_export_upload.rb | 2 - .../_account_and_limit.html.haml | 4 + .../admin/broadcast_messages/_form.html.haml | 4 +- .../projects/pipelines/_with_tabs.html.haml | 1 + app/views/shared/_broadcast_message.html.haml | 4 +- changelogs/unreleased/215517-tab-docs-ff.yml | 5 + .../unreleased/215658-graphql-memberships.yml | 5 + ...lication-limits-to-ci-instancevariable.yml | 5 + .../unreleased/216835-instrument-db-calls.yml | 6 + ...dd-route-to-ghost-lost-and-found-group.yml | 5 - ...412-update-error-tracking-list-message.yml | 5 + changelogs/unreleased/fix-max_import_size.yml | 5 + ...e_level_variables_column_to_plan_limits.rb | 9 + .../20200527211000_add_max_import_size.rb | 15 + ...t_and_found_group_and_orphaned_projects.rb | 167 ----- db/structure.sql | 7 +- doc/.vale/gitlab/Acronyms.yml | 6 +- doc/.vale/gitlab/BadgeCapitalization.yml | 2 +- doc/.vale/gitlab/British.yml | 4 +- doc/.vale/gitlab/CodeblockFences.yml | 2 +- doc/.vale/gitlab/Contractions.yml | 4 +- doc/.vale/gitlab/CurlStringsQuoted.yml | 2 +- doc/.vale/gitlab/FirstPerson.yml | 5 +- doc/.vale/gitlab/InternalLinkExtension.yml | 2 +- doc/.vale/gitlab/LatinTerms.yml | 6 +- doc/.vale/gitlab/MeaningfulLinkWords.yml | 2 +- doc/.vale/gitlab/OxfordComma.yml | 4 +- doc/.vale/gitlab/RelativeLinks.yml | 2 +- doc/.vale/gitlab/SentenceLength.yml | 4 +- doc/.vale/gitlab/Spelling.yml | 3 + doc/.vale/gitlab/SubstitutionWarning.yml | 2 + doc/administration/instance_limits.md | 18 + .../monitoring/prometheus/gitlab_metrics.md | 5 +- doc/administration/troubleshooting/index.md | 20 + .../graphql/reference/gitlab_schema.graphql | 217 +++++- doc/api/graphql/reference/gitlab_schema.json | 625 +++++++++++++++++- doc/api/graphql/reference/index.md | 33 +- doc/api/group_import_export.md | 4 + doc/api/instance_level_ci_variables.md | 3 +- doc/api/project_import_export.md | 4 + doc/api/settings.md | 3 + .../img/dag_graph_example_clicked_v13_1.png | Bin 0 -> 54491 bytes .../img/dag_graph_example_v13_1.png | Bin 0 -> 54919 bytes doc/ci/directed_acyclic_graph/index.md | 37 ++ doc/user/admin_area/abuse_reports.md | 3 + .../activating_deactivating_users.md | 3 + .../admin_area/blocking_unblocking_users.md | 3 + doc/user/admin_area/credentials_inventory.md | 7 + .../admin_area/custom_project_templates.md | 3 + doc/user/admin_area/diff_limits.md | 3 + doc/user/admin_area/geo_nodes.md | 3 + doc/user/admin_area/labels.md | 3 + doc/user/admin_area/license.md | 3 + .../admin_area/merge_requests_approvals.md | 3 + .../settings/account_and_limit_settings.md | 11 + doc/user/gitlab_com/index.md | 1 + doc/user/group/settings/import_export.md | 4 + doc/user/project/settings/import_export.md | 4 + lib/api/group_import.rb | 2 +- lib/api/project_import.rb | 5 +- lib/api/settings.rb | 1 + lib/gitlab/ci/features.rb | 4 + .../json/streaming_serializer.rb | 15 +- .../legacy_relation_tree_saver.rb | 8 +- lib/gitlab/lograge/custom_options.rb | 12 +- lib/gitlab/metrics/sidekiq_middleware.rb | 15 +- .../metrics/subscribers/active_record.rb | 18 +- lib/gitlab/metrics/transaction.rb | 10 +- .../sidekiq_logging/structured_logger.rb | 5 + locale/gitlab.pot | 17 +- package.json | 2 +- spec/factories/services.rb | 7 - spec/features/admin/admin_settings_spec.rb | 10 + .../pipelines/components/dag/dag_spec.js | 14 +- spec/graphql/types/access_level_enum_spec.rb | 11 + spec/graphql/types/access_level_type_spec.rb | 13 + spec/graphql/types/group_member_type_spec.rb | 19 + .../graphql/types/project_member_type_spec.rb | 18 +- spec/graphql/types/user_type_spec.rb | 15 +- spec/lib/gitlab/danger/changelog_spec.rb | 4 +- .../json/streaming_serializer_spec.rb | 22 + .../legacy_relation_tree_saver_spec.rb | 34 +- .../lib/gitlab/lograge/custom_options_spec.rb | 12 + .../gitlab/metrics/sidekiq_middleware_spec.rb | 20 +- .../metrics/subscribers/active_record_spec.rb | 132 +++- spec/lib/gitlab/metrics/transaction_spec.rb | 40 +- .../sidekiq_logging/structured_logger_spec.rb | 10 +- ...up_projects_with_missing_namespace_spec.rb | 32 +- ..._found_group_and_orphaned_projects_spec.rb | 96 --- spec/models/application_setting_spec.rb | 8 + spec/models/ci/instance_variable_spec.rb | 19 + .../graphql/user/group_member_query_spec.rb | 32 + .../graphql/user/project_member_query_spec.rb | 32 + .../graphql/members_shared_examples.rb | 22 + yarn.lock | 8 +- 112 files changed, 1794 insertions(+), 428 deletions(-) create mode 100644 app/graphql/types/access_level_enum.rb create mode 100644 app/graphql/types/access_level_type.rb create mode 100644 app/graphql/types/group_member_type.rb create mode 100644 app/graphql/types/member_interface.rb create mode 100644 changelogs/unreleased/215517-tab-docs-ff.yml create mode 100644 changelogs/unreleased/215658-graphql-memberships.yml create mode 100644 changelogs/unreleased/216097-add-application-limits-to-ci-instancevariable.yml create mode 100644 changelogs/unreleased/216835-instrument-db-calls.yml delete mode 100644 changelogs/unreleased/219658-add-route-to-ghost-lost-and-found-group.yml create mode 100644 changelogs/unreleased/37412-update-error-tracking-list-message.yml create mode 100644 changelogs/unreleased/fix-max_import_size.yml create mode 100644 db/migrate/20200519141534_add_instance_level_variables_column_to_plan_limits.rb create mode 100644 db/migrate/20200527211000_add_max_import_size.rb delete mode 100644 db/post_migrate/20200602143020_update_routes_for_lost_and_found_group_and_orphaned_projects.rb create mode 100644 doc/administration/troubleshooting/index.md create mode 100644 doc/ci/directed_acyclic_graph/img/dag_graph_example_clicked_v13_1.png create mode 100644 doc/ci/directed_acyclic_graph/img/dag_graph_example_v13_1.png create mode 100644 spec/graphql/types/access_level_enum_spec.rb create mode 100644 spec/graphql/types/access_level_type_spec.rb create mode 100644 spec/graphql/types/group_member_type_spec.rb delete mode 100644 spec/migrations/update_routes_for_lost_and_found_group_and_orphaned_projects_spec.rb create mode 100644 spec/requests/api/graphql/user/group_member_query_spec.rb create mode 100644 spec/requests/api/graphql/user/project_member_query_spec.rb create mode 100644 spec/support/shared_examples/graphql/members_shared_examples.rb diff --git a/.gitignore b/.gitignore index abccf99229f..29180b76e26 100644 --- a/.gitignore +++ b/.gitignore @@ -93,3 +93,4 @@ webpack-dev-server.json .solargraph.yml apollo.config.js /tmp/matching_foss_tests.txt +ee/changelogs/unreleased-ee diff --git a/app/assets/javascripts/boards/stores/boards_store.js b/app/assets/javascripts/boards/stores/boards_store.js index 32c87d89d4a..fb3d2b81060 100644 --- a/app/assets/javascripts/boards/stores/boards_store.js +++ b/app/assets/javascripts/boards/stores/boards_store.js @@ -43,6 +43,7 @@ const boardsStore = { }, detail: { issue: {}, + list: {}, }, moving: { issue: {}, @@ -74,6 +75,7 @@ const boardsStore = { this.filter.path = getUrlParamsArray().join('&'); this.detail = { issue: {}, + list: {}, }; }, showPage(page) { diff --git a/app/assets/javascripts/error_tracking/store/list/actions.js b/app/assets/javascripts/error_tracking/store/list/actions.js index 4170c1bf759..94cf444d2e4 100644 --- a/app/assets/javascripts/error_tracking/store/list/actions.js +++ b/app/assets/javascripts/error_tracking/store/list/actions.js @@ -2,7 +2,7 @@ import Service from '../../services'; import * as types from './mutation_types'; import createFlash from '~/flash'; import Poll from '~/lib/utils/poll'; -import { __, sprintf } from '~/locale'; +import { __ } from '~/locale'; let eTagPoll; @@ -31,17 +31,9 @@ export function startPolling({ state, commit, dispatch }) { commit(types.SET_LOADING, false); dispatch('stopPolling'); }, - errorCallback: ({ response }) => { - let errorMessage = ''; - if (response && response.data && response.data.message) { - errorMessage = response.data.message; - } + errorCallback: () => { commit(types.SET_LOADING, false); - createFlash( - sprintf(__(`Failed to load errors from Sentry. Error message: %{errorMessage}`), { - errorMessage, - }), - ); + createFlash(__('Failed to load errors from Sentry.')); }, }); diff --git a/app/assets/javascripts/pipelines/components/dag/dag.vue b/app/assets/javascripts/pipelines/components/dag/dag.vue index 3547909ac7d..6e0d23ef87f 100644 --- a/app/assets/javascripts/pipelines/components/dag/dag.vue +++ b/app/assets/javascripts/pipelines/components/dag/dag.vue @@ -1,5 +1,5 @@