From e5731d5194e20deb33725943248c5899e4fdf05d Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 15 May 2020 09:07:59 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .rubocop.yml | 1 - .../components/expires_at_field.vue | 14 + app/assets/javascripts/access_tokens/index.js | 12 + .../components/alert_details.vue | 60 +- .../components/alert_management_list.vue | 11 +- .../javascripts/alert_management/constants.js | 15 +- .../javascripts/alert_management/details.js | 16 +- .../graphql/queries/getAlerts.query.graphql | 4 +- .../ide/components/new_dropdown/modal.vue | 3 + app/assets/javascripts/ide/utils.js | 6 + .../pages/admin/impersonation_tokens/index.js | 4 +- .../profiles/personal_access_tokens/index.js | 4 +- .../projects/settings/access_tokens/index.js | 3 + app/assets/stylesheets/pages/error_list.scss | 2 +- app/graphql/types/release_type.rb | 2 - app/helpers/projects_helper.rb | 1 + app/models/concerns/timebox.rb | 1 - app/models/issue.rb | 1 + app/models/iteration.rb | 82 +- app/models/milestone.rb | 1 + app/models/project_repository_storage_move.rb | 3 + app/models/release.rb | 8 - app/presenters/release_presenter.rb | 7 - app/uploaders/file_uploader.rb | 2 +- .../impersonation_tokens/index.html.haml | 28 +- .../layouts/nav/sidebar/_project.html.haml | 5 + .../personal_access_tokens/index.html.haml | 24 +- .../settings/access_tokens/index.html.haml | 34 + app/views/shared/_label_row.html.haml | 2 +- app/views/shared/_milestones_filter.html.haml | 6 +- ..._access_tokens_created_container.html.haml | 15 - .../_personal_access_tokens_form.html.haml | 31 - app/views/shared/_project_limit.html.haml | 6 +- .../_created_container.html.haml | 12 + .../shared/access_tokens/_form.html.haml | 34 + .../_table.html.haml} | 13 +- .../issuable/_close_reopen_button.html.haml | 12 +- .../_close_reopen_report_toggle.html.haml | 18 +- app/views/shared/members/_member.html.haml | 4 +- .../1600-remove-jenkinsdeprecatedservice.yml | 5 + .../213566-deploy-token-basic-auth.yml | 6 + ...-deprecated-release-evidence-endpoints.yml | 5 + ...213894-northstar-metric-monitor-health.yml | 5 + .../unreleased/216509-ide-new-file-trim.yml | 5 + ...e-with-nil-secret-in-the-db-are-broken.yml | 5 + ...---app-views-shared-issuable-_close_re.yml | 5 + ...---views-shared-issuable-_close_re-btn.yml | 5 + ...---app-views-shared-_label_row-html-ha.yml | 5 + ...---app-views-shared-_milestones_filter.yml | 5 + ...---app-views-shared-_project_limit-htm.yml | 5 + .../unreleased/dz-update-android-template.yml | 5 + changelogs/unreleased/error-list-colour.yml | 5 + .../unreleased/leaky-constant-fix-27.yml | 5 + changelogs/unreleased/storage_move_api.yml | 5 + config/redis.cache.yml.example | 6 +- config/redis.queues.yml.example | 6 +- config/redis.shared_state.yml.example | 6 +- config/resque.yml.example | 6 +- config/routes/project.rb | 2 +- ...01827_sprint_rename_state_to_state_enum.rb | 17 + ...move_deprecated_jenkins_service_records.rb | 17 + ...nt_make_state_enum_not_null_and_default.rb | 15 + ...0429002150_cleanup_sprints_state_rename.rb | 17 + ...recated_jenkins_service_records_removal.rb | 17 + db/structure.sql | 7 +- doc/administration/high_availability/redis.md | 120 +-- .../high_availability/redis_source.md | 42 +- doc/api/api_resources.md | 1 + .../graphql/reference/gitlab_schema.graphql | 266 +++++- doc/api/graphql/reference/gitlab_schema.json | 797 +++++++++++++++++- doc/api/graphql/reference/index.md | 40 +- doc/api/project_repository_storage_moves.md | 80 ++ doc/api/services.md | 3 + doc/development/scalability.md | 6 +- doc/downgrade_ee_to_ce/README.md | 7 +- doc/install/aws/index.md | 2 +- doc/integration/elasticsearch.md | 4 +- doc/integration/jenkins_deprecated.md | 3 + .../admin_area/settings/usage_statistics.md | 5 +- doc/user/packages/nuget_repository/index.md | 14 +- doc/user/packages/pypi_repository/index.md | 23 + lib/api/api.rb | 1 + .../project_repository_storage_move.rb | 14 + lib/api/entities/release.rb | 2 - lib/api/project_repository_storage_moves.rb | 34 + lib/gitlab/auth/auth_finders.rb | 6 + .../Security/License-Management.gitlab-ci.yml | 2 +- .../graphql/pagination/keyset/order_info.rb | 2 + lib/gitlab/usage_data.rb | 6 +- locale/gitlab.pot | 112 ++- qa/qa/page/profile/personal_access_tokens.rb | 14 +- spec/factories/iterations.rb | 26 +- spec/factories/usage_data.rb | 10 + .../admin_users_impersonation_tokens_spec.rb | 4 +- .../profiles/personal_access_tokens_spec.rb | 4 +- spec/features/projects/members/list_spec.rb | 19 +- .../projects/settings/access_tokens_spec.rb | 93 ++ .../v4/project_repository_storage_move.json | 20 + .../v4/project_repository_storage_moves.json | 6 + .../config/redis_cache_new_format_host.yml | 8 +- .../fixtures/config/redis_new_format_host.yml | 8 +- .../config/redis_queues_new_format_host.yml | 8 +- .../redis_shared_state_new_format_host.yml | 8 +- .../gitlab/import_export/complex/project.json | 20 - .../complex/tree/project/services.ndjson | 1 - .../child_with_no_parent/tree.tar.gz | Bin 885 -> 0 bytes .../tree/groups/4351.json | 1 + .../tree/groups/4352.json | 1 + .../tree/groups/_all.ndjson | 2 + .../group_exports/complex/tree.tar.gz | Bin 9208 -> 0 bytes .../complex/tree/groups/4351.json | 1 + .../complex/tree/groups/4351/badges.ndjson | 1 + .../complex/tree/groups/4351/boards.ndjson | 1 + .../complex/tree/groups/4351/epics.ndjson | 5 + .../complex/tree/groups/4351/labels.ndjson | 10 + .../complex/tree/groups/4351/members.ndjson | 6 + .../tree/groups/4351/milestones.ndjson | 5 + .../complex/tree/groups/4352.json | 1 + .../complex/tree/groups/4352/badges.ndjson | 1 + .../complex/tree/groups/4352/boards.ndjson | 2 + .../complex/tree/groups/4352/epics.ndjson | 5 + .../complex/tree/groups/4352/labels.ndjson | 9 + .../complex/tree/groups/4352/members.ndjson | 6 + .../tree/groups/4352/milestones.ndjson | 5 + .../complex/tree/groups/4353.json | 1 + .../complex/tree/groups/4353/badges.ndjson | 1 + .../complex/tree/groups/4353/boards.ndjson | 2 + .../complex/tree/groups/4353/epics.ndjson | 5 + .../complex/tree/groups/4353/labels.ndjson | 9 + .../complex/tree/groups/4353/members.ndjson | 6 + .../tree/groups/4353/milestones.ndjson | 5 + .../complex/tree/groups/_all.ndjson | 3 + .../group_exports/no_children/tree.tar.gz | Bin 4416 -> 0 bytes .../no_children/tree/groups/4353.json | 41 + .../tree/groups/4353/badges.ndjson | 1 + .../tree/groups/4353/boards.ndjson | 2 + .../no_children/tree/groups/4353/epics.ndjson | 5 + .../tree/groups/4353/labels.ndjson | 10 + .../tree/groups/4353/members.ndjson | 6 + .../tree/groups/4353/milestones.ndjson | 5 + .../no_children/tree/groups/_all.ndjson | 1 + .../visibility_levels/internal/tree.tar.gz | Bin 881 -> 0 bytes .../internal/tree/groups/283.json | 1 + .../internal/tree/groups/284.json | 1 + .../internal/tree/groups/285.json | 1 + .../internal/tree/groups/286.json | 1 + .../internal/tree/groups/_all.ndjson | 4 + .../visibility_levels/private/tree.tar.gz | Bin 876 -> 0 bytes .../private/tree/groups/283.json | 1 + .../private/tree/groups/284.json | 1 + .../private/tree/groups/285.json | 1 + .../private/tree/groups/286.json | 1 + .../private/tree/groups/_all.ndjson | 4 + .../visibility_levels/public/tree.tar.gz | Bin 871 -> 0 bytes .../public/tree/groups/283.json | 1 + .../public/tree/groups/284.json | 1 + .../public/tree/groups/285.json | 1 + .../public/tree/groups/286.json | 1 + .../public/tree/groups/_all.ndjson | 4 + .../alert_management_detail_spec.js | 53 +- .../components/alert_management_list_spec.js | 11 - .../alert_management/mocks/alerts.json | 6 +- .../ide/components/new_dropdown/modal_spec.js | 12 +- spec/frontend/ide/utils_spec.js | 17 +- spec/graphql/types/release_type_spec.rb | 2 +- .../project_repository_storage_move_spec.rb | 21 + spec/lib/gitlab/auth/auth_finders_spec.rb | 49 +- spec/lib/gitlab/import_export/all_models.yml | 1 - .../import_export/group/tree_restorer_spec.rb | 16 - spec/lib/gitlab/sidekiq_middleware_spec.rb | 14 +- spec/lib/gitlab/usage_data_spec.rb | 2 + ...deprecated_jenkins_service_records_spec.rb | 28 + spec/models/issue_spec.rb | 20 + spec/models/iteration_spec.rb | 138 ++- spec/models/release_spec.rb | 32 - .../project_repository_storage_moves_spec.rb | 89 ++ spec/routing/project_routing_spec.rb | 2 + spec/support/import_export/common_util.rb | 19 - spec/support/redis/redis_shared_examples.rb | 2 +- .../navbar_structure_context.rb | 1 + .../services_shared_context.rb | 3 +- .../concerns/timebox_shared_examples.rb | 14 +- spec/uploaders/file_uploader_spec.rb | 68 +- .../nav/sidebar/_project.html.haml_spec.rb | 26 + vendor/project_templates/android.tar.gz | Bin 132592 -> 133429 bytes 185 files changed, 2857 insertions(+), 518 deletions(-) create mode 100644 app/assets/javascripts/access_tokens/components/expires_at_field.vue create mode 100644 app/assets/javascripts/access_tokens/index.js create mode 100644 app/assets/javascripts/pages/projects/settings/access_tokens/index.js delete mode 100644 app/views/shared/_personal_access_tokens_created_container.html.haml delete mode 100644 app/views/shared/_personal_access_tokens_form.html.haml create mode 100644 app/views/shared/access_tokens/_created_container.html.haml create mode 100644 app/views/shared/access_tokens/_form.html.haml rename app/views/shared/{_personal_access_tokens_table.html.haml => access_tokens/_table.html.haml} (58%) create mode 100644 changelogs/unreleased/1600-remove-jenkinsdeprecatedservice.yml create mode 100644 changelogs/unreleased/213566-deploy-token-basic-auth.yml create mode 100644 changelogs/unreleased/213678-remove-deprecated-release-evidence-endpoints.yml create mode 100644 changelogs/unreleased/213894-northstar-metric-monitor-health.yml create mode 100644 changelogs/unreleased/216509-ide-new-file-trim.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-externalize-i18n-strings-from---app-views-shared-issuable-_close_re.yml create mode 100644 changelogs/unreleased/22691-externalize-i18n-strings-from---views-shared-issuable-_close_re-btn.yml create mode 100644 changelogs/unreleased/22691-externelize-i18n-strings-from---app-views-shared-_label_row-html-ha.yml create mode 100644 changelogs/unreleased/22691-externelize-i18n-strings-from---app-views-shared-_milestones_filter.yml create mode 100644 changelogs/unreleased/22691-externelize-i18n-strings-from---app-views-shared-_project_limit-htm.yml create mode 100644 changelogs/unreleased/dz-update-android-template.yml create mode 100644 changelogs/unreleased/error-list-colour.yml create mode 100644 changelogs/unreleased/leaky-constant-fix-27.yml create mode 100644 changelogs/unreleased/storage_move_api.yml create mode 100644 db/migrate/20200429001827_sprint_rename_state_to_state_enum.rb create mode 100644 db/migrate/20200511130129_remove_deprecated_jenkins_service_records.rb create mode 100644 db/migrate/20200512164334_sprint_make_state_enum_not_null_and_default.rb create mode 100644 db/post_migrate/20200429002150_cleanup_sprints_state_rename.rb create mode 100644 db/post_migrate/20200511130130_ensure_deprecated_jenkins_service_records_removal.rb create mode 100644 doc/api/project_repository_storage_moves.md create mode 100644 lib/api/entities/project_repository_storage_move.rb create mode 100644 lib/api/project_repository_storage_moves.rb create mode 100644 spec/features/projects/settings/access_tokens_spec.rb create mode 100644 spec/fixtures/api/schemas/public_api/v4/project_repository_storage_move.json create mode 100644 spec/fixtures/api/schemas/public_api/v4/project_repository_storage_moves.json delete mode 100644 spec/fixtures/lib/gitlab/import_export/group_exports/child_with_no_parent/tree.tar.gz create mode 100644 spec/fixtures/lib/gitlab/import_export/group_exports/child_with_no_parent/tree/groups/4351.json create mode 100644 spec/fixtures/lib/gitlab/import_export/group_exports/child_with_no_parent/tree/groups/4352.json create mode 100644 spec/fixtures/lib/gitlab/import_export/group_exports/child_with_no_parent/tree/groups/_all.ndjson delete mode 100644 spec/fixtures/lib/gitlab/import_export/group_exports/complex/tree.tar.gz create mode 100644 spec/fixtures/lib/gitlab/import_export/group_exports/complex/tree/groups/4351.json create mode 100644 spec/fixtures/lib/gitlab/import_export/group_exports/complex/tree/groups/4351/badges.ndjson create mode 100644 spec/fixtures/lib/gitlab/import_export/group_exports/complex/tree/groups/4351/boards.ndjson create mode 100644 spec/fixtures/lib/gitlab/import_export/group_exports/complex/tree/groups/4351/epics.ndjson create mode 100644 spec/fixtures/lib/gitlab/import_export/group_exports/complex/tree/groups/4351/labels.ndjson create mode 100644 spec/fixtures/lib/gitlab/import_export/group_exports/complex/tree/groups/4351/members.ndjson create mode 100644 spec/fixtures/lib/gitlab/import_export/group_exports/complex/tree/groups/4351/milestones.ndjson create mode 100644 spec/fixtures/lib/gitlab/import_export/group_exports/complex/tree/groups/4352.json create mode 100644 spec/fixtures/lib/gitlab/import_export/group_exports/complex/tree/groups/4352/badges.ndjson create mode 100644 spec/fixtures/lib/gitlab/import_export/group_exports/complex/tree/groups/4352/boards.ndjson create mode 100644 spec/fixtures/lib/gitlab/import_export/group_exports/complex/tree/groups/4352/epics.ndjson create mode 100644 spec/fixtures/lib/gitlab/import_export/group_exports/complex/tree/groups/4352/labels.ndjson create mode 100644 spec/fixtures/lib/gitlab/import_export/group_exports/complex/tree/groups/4352/members.ndjson create mode 100644 spec/fixtures/lib/gitlab/import_export/group_exports/complex/tree/groups/4352/milestones.ndjson create mode 100644 spec/fixtures/lib/gitlab/import_export/group_exports/complex/tree/groups/4353.json create mode 100644 spec/fixtures/lib/gitlab/import_export/group_exports/complex/tree/groups/4353/badges.ndjson create mode 100644 spec/fixtures/lib/gitlab/import_export/group_exports/complex/tree/groups/4353/boards.ndjson create mode 100644 spec/fixtures/lib/gitlab/import_export/group_exports/complex/tree/groups/4353/epics.ndjson create mode 100644 spec/fixtures/lib/gitlab/import_export/group_exports/complex/tree/groups/4353/labels.ndjson create mode 100644 spec/fixtures/lib/gitlab/import_export/group_exports/complex/tree/groups/4353/members.ndjson create mode 100644 spec/fixtures/lib/gitlab/import_export/group_exports/complex/tree/groups/4353/milestones.ndjson create mode 100644 spec/fixtures/lib/gitlab/import_export/group_exports/complex/tree/groups/_all.ndjson delete mode 100644 spec/fixtures/lib/gitlab/import_export/group_exports/no_children/tree.tar.gz create mode 100644 spec/fixtures/lib/gitlab/import_export/group_exports/no_children/tree/groups/4353.json create mode 100644 spec/fixtures/lib/gitlab/import_export/group_exports/no_children/tree/groups/4353/badges.ndjson create mode 100644 spec/fixtures/lib/gitlab/import_export/group_exports/no_children/tree/groups/4353/boards.ndjson create mode 100644 spec/fixtures/lib/gitlab/import_export/group_exports/no_children/tree/groups/4353/epics.ndjson create mode 100644 spec/fixtures/lib/gitlab/import_export/group_exports/no_children/tree/groups/4353/labels.ndjson create mode 100644 spec/fixtures/lib/gitlab/import_export/group_exports/no_children/tree/groups/4353/members.ndjson create mode 100644 spec/fixtures/lib/gitlab/import_export/group_exports/no_children/tree/groups/4353/milestones.ndjson create mode 100644 spec/fixtures/lib/gitlab/import_export/group_exports/no_children/tree/groups/_all.ndjson delete mode 100644 spec/fixtures/lib/gitlab/import_export/group_exports/visibility_levels/internal/tree.tar.gz create mode 100644 spec/fixtures/lib/gitlab/import_export/group_exports/visibility_levels/internal/tree/groups/283.json create mode 100644 spec/fixtures/lib/gitlab/import_export/group_exports/visibility_levels/internal/tree/groups/284.json create mode 100644 spec/fixtures/lib/gitlab/import_export/group_exports/visibility_levels/internal/tree/groups/285.json create mode 100644 spec/fixtures/lib/gitlab/import_export/group_exports/visibility_levels/internal/tree/groups/286.json create mode 100644 spec/fixtures/lib/gitlab/import_export/group_exports/visibility_levels/internal/tree/groups/_all.ndjson delete mode 100644 spec/fixtures/lib/gitlab/import_export/group_exports/visibility_levels/private/tree.tar.gz create mode 100644 spec/fixtures/lib/gitlab/import_export/group_exports/visibility_levels/private/tree/groups/283.json create mode 100644 spec/fixtures/lib/gitlab/import_export/group_exports/visibility_levels/private/tree/groups/284.json create mode 100644 spec/fixtures/lib/gitlab/import_export/group_exports/visibility_levels/private/tree/groups/285.json create mode 100644 spec/fixtures/lib/gitlab/import_export/group_exports/visibility_levels/private/tree/groups/286.json create mode 100644 spec/fixtures/lib/gitlab/import_export/group_exports/visibility_levels/private/tree/groups/_all.ndjson delete mode 100644 spec/fixtures/lib/gitlab/import_export/group_exports/visibility_levels/public/tree.tar.gz create mode 100644 spec/fixtures/lib/gitlab/import_export/group_exports/visibility_levels/public/tree/groups/283.json create mode 100644 spec/fixtures/lib/gitlab/import_export/group_exports/visibility_levels/public/tree/groups/284.json create mode 100644 spec/fixtures/lib/gitlab/import_export/group_exports/visibility_levels/public/tree/groups/285.json create mode 100644 spec/fixtures/lib/gitlab/import_export/group_exports/visibility_levels/public/tree/groups/286.json create mode 100644 spec/fixtures/lib/gitlab/import_export/group_exports/visibility_levels/public/tree/groups/_all.ndjson create mode 100644 spec/lib/api/entities/project_repository_storage_move_spec.rb create mode 100644 spec/migrations/remove_deprecated_jenkins_service_records_spec.rb create mode 100644 spec/requests/api/project_repository_storage_moves_spec.rb diff --git a/.rubocop.yml b/.rubocop.yml index f088bb0a13d..77dd43f5d87 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -375,7 +375,6 @@ RSpec/LeakyConstantDeclaration: - 'spec/lib/gitlab/quick_actions/dsl_spec.rb' - 'spec/lib/gitlab/sidekiq_middleware/client_metrics_spec.rb' - 'spec/lib/gitlab/sidekiq_middleware/server_metrics_spec.rb' - - 'spec/lib/gitlab/sidekiq_middleware_spec.rb' - 'spec/lib/gitlab/view/presenter/factory_spec.rb' - 'spec/lib/marginalia_spec.rb' - 'spec/lib/omni_auth/strategies/jwt_spec.rb' diff --git a/app/assets/javascripts/access_tokens/components/expires_at_field.vue b/app/assets/javascripts/access_tokens/components/expires_at_field.vue new file mode 100644 index 00000000000..d0932ad80e1 --- /dev/null +++ b/app/assets/javascripts/access_tokens/components/expires_at_field.vue @@ -0,0 +1,14 @@ + + + diff --git a/app/assets/javascripts/access_tokens/index.js b/app/assets/javascripts/access_tokens/index.js new file mode 100644 index 00000000000..9bdb2940956 --- /dev/null +++ b/app/assets/javascripts/access_tokens/index.js @@ -0,0 +1,12 @@ +import Vue from 'vue'; +import ExpiresAtField from './components/expires_at_field.vue'; + +const initExpiresAtField = () => { + // eslint-disable-next-line no-new + new Vue({ + el: document.querySelector('.js-access-tokens-expires-at'), + components: { ExpiresAtField }, + }); +}; + +export default initExpiresAtField; diff --git a/app/assets/javascripts/alert_management/components/alert_details.vue b/app/assets/javascripts/alert_management/components/alert_details.vue index 12d8f3be54a..587db1c7200 100644 --- a/app/assets/javascripts/alert_management/components/alert_details.vue +++ b/app/assets/javascripts/alert_management/components/alert_details.vue @@ -1,12 +1,25 @@ @@ -97,7 +131,7 @@ export default { {{ $options.i18n.errorMsg }}
-
+
@@ -137,6 +171,28 @@ export default { >

{{ alert.title }}

+ + + + + {{ label }} + + +