From 5ad0cf26551baff8f08af8562a8d45e6ec14d71a Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 23 Jan 2020 12:08:38 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .gitlab/ci/global.gitlab-ci.yml | 2 +- .gitlab/ci/qa.gitlab-ci.yml | 9 +- .../groups/components/group_folder.vue | 2 +- .../groups/components/group_item.vue | 4 +- .../serverless/components/environment_row.vue | 2 +- .../serverless/components/function_row.vue | 2 +- app/assets/stylesheets/pages/groups.scss | 11 +- app/controllers/concerns/page_limiter.rb | 68 + .../explore/projects_controller.rb | 33 +- .../projects/snippets_controller.rb | 24 +- app/controllers/snippets/notes_controller.rb | 2 +- app/controllers/snippets_controller.rb | 8 +- app/controllers/uploads_controller.rb | 2 + app/graphql/mutations/snippets/create.rb | 4 +- app/graphql/types/permission_types/project.rb | 2 +- app/graphql/types/permission_types/user.rb | 2 +- app/helpers/markup_helper.rb | 29 +- app/helpers/projects_helper.rb | 4 +- app/mailers/emails/notes.rb | 16 +- app/models/ability.rb | 2 +- .../project_features_compatibility.rb | 4 + app/models/event.rb | 6 +- app/models/note.rb | 2 +- app/models/project.rb | 4 +- app/models/snippet.rb | 6 +- app/policies/global_policy.rb | 4 +- app/policies/personal_snippet_policy.rb | 15 +- app/policies/project_policy.rb | 14 +- app/policies/project_snippet_policy.rb | 37 +- app/services/snippets/destroy_service.rb | 4 +- .../_account_and_limit.html.haml | 2 +- app/views/dashboard/_snippets_head.html.haml | 2 +- app/views/dashboard/snippets/index.html.haml | 2 +- .../projects/page_out_of_bounds.html.haml | 21 + app/views/layouts/header/_new_dropdown.haml | 4 +- .../note_project_snippet_email.html.haml | 1 - .../note_project_snippet_email.text.erb | 1 - ...html.haml => note_snippet_email.html.haml} | 0 ...l.text.erb => note_snippet_email.text.erb} | 0 .../projects/buttons/_dropdown.html.haml | 2 +- .../projects/snippets/_actions.html.haml | 14 +- app/views/projects/snippets/index.html.haml | 2 +- app/views/snippets/_actions.html.haml | 12 +- app/views/snippets/_snippets.html.haml | 2 +- ...pacing-to-the-old-more-space-efficient.yml | 5 + ...plore-projectscontroller-index-latency.yml | 5 + ...odos-should-not-depend-on-gitaly-calls.yml | 6 + .../get_deployments_for_kubernetes_1-16.yml | 5 + .../unreleased/graphiql_relative_url.yml | 5 + doc/api/projects.md | 3 + doc/development/gitaly.md | 14 +- .../project/issues/issue_data_and_actions.md | 2 +- lib/api/award_emoji.rb | 2 + lib/api/entities.rb | 1 + lib/api/helpers/notes_helpers.rb | 10 +- lib/api/helpers/projects_helpers.rb | 2 + lib/api/project_snippets.rb | 6 +- lib/api/snippets.rb | 4 +- lib/banzai/reference_parser/snippet_parser.rb | 2 +- lib/gitlab/gpg.rb | 7 +- lib/gitlab/kubernetes/kube_client.rb | 20 +- locale/ar_SA/gitlab.po | 4546 ++- locale/bg/gitlab.po | 4470 ++- locale/bn_BD/gitlab.po | 4458 ++- locale/bn_IN/gitlab.po | 4458 ++- locale/ca_ES/gitlab.po | 4464 ++- locale/cs_CZ/gitlab.po | 4504 ++- locale/cy_GB/gitlab.po | 4546 ++- locale/da_DK/gitlab.po | 4458 ++- locale/de/gitlab.po | 5086 +++- locale/el_GR/gitlab.po | 4458 ++- locale/eo/gitlab.po | 4470 ++- locale/es/gitlab.po | 4994 +++- locale/et_EE/gitlab.po | 4458 ++- locale/fa_IR/gitlab.po | 4458 ++- locale/fil_PH/gitlab.po | 4458 ++- locale/fr/gitlab.po | 4580 ++- locale/gitlab.pot | 13 +- locale/gl_ES/gitlab.po | 4458 ++- locale/he_IL/gitlab.po | 4504 ++- locale/hi_IN/gitlab.po | 4458 ++- locale/hr_HR/gitlab.po | 4483 ++- locale/hu_HU/gitlab.po | 4458 ++- locale/id_ID/gitlab.po | 4435 ++- locale/it/gitlab.po | 4476 ++- locale/ja/gitlab.po | 5089 +++- locale/ka_GE/gitlab.po | 4458 ++- locale/ko/gitlab.po | 5181 +++- locale/ku_TR/gitlab.po | 22997 ++++++++++++++++ locale/ml_IN/gitlab.po | 22997 ++++++++++++++++ locale/mn_MN/gitlab.po | 4458 ++- locale/nb_NO/gitlab.po | 4458 ++- locale/nl_NL/gitlab.po | 4462 ++- locale/pa_IN/gitlab.po | 4458 ++- locale/pl_PL/gitlab.po | 4508 ++- locale/pt_BR/gitlab.po | 4792 +++- locale/pt_PT/gitlab.po | 4508 ++- locale/ro_RO/gitlab.po | 4483 ++- locale/ru/gitlab.po | 6688 +++-- locale/sk_SK/gitlab.po | 4504 ++- locale/sq_AL/gitlab.po | 4458 ++- locale/sr_CS/gitlab.po | 4483 ++- locale/sr_SP/gitlab.po | 4483 ++- locale/sv_SE/gitlab.po | 4458 ++- locale/sw_KE/gitlab.po | 4458 ++- locale/tr_TR/gitlab.po | 5518 +++- locale/uk/gitlab.po | 5422 +++- locale/ur_PK/gitlab.po | 22997 ++++++++++++++++ locale/uz_UZ/gitlab.po | 22997 ++++++++++++++++ locale/vi_VN/gitlab.po | 4435 ++- locale/zh_CN/gitlab.po | 6551 +++-- locale/zh_HK/gitlab.po | 4453 ++- locale/zh_TW/gitlab.po | 10759 +++++--- qa/qa/runtime/browser.rb | 42 - qa/qa/runtime/release.rb | 10 + qa/qa/scenario/template.rb | 5 +- qa/qa/scenario/test/instance.rb | 5 +- .../scenario_shared_examples.rb | 6 + .../controllers/concerns/page_limiter_spec.rb | 97 + .../explore/projects_controller_spec.rb | 75 + .../project_error_tracking_settings.rb | 2 +- .../user_sees_error_details_spec.rb | 32 + .../user_sees_error_index_spec.rb | 69 + .../sentry/issue_sample_response.json | 282 +- spec/helpers/markup_helper_spec.rb | 18 + spec/lib/gitlab/gpg_spec.rb | 4 +- .../lib/gitlab/kubernetes/kube_client_spec.rb | 28 +- spec/lib/sentry/client/issue_spec.rb | 4 +- spec/mailers/notify_spec.rb | 26 +- .../project_features_compatibility_spec.rb | 36 +- spec/models/note_spec.rb | 8 +- spec/policies/global_policy_spec.rb | 8 +- spec/policies/note_policy_spec.rb | 41 +- spec/policies/personal_snippet_policy_spec.rb | 28 +- spec/policies/project_policy_spec.rb | 8 +- spec/policies/project_snippet_policy_spec.rb | 46 +- spec/presenters/snippet_presenter_spec.rb | 24 +- spec/requests/api/projects_spec.rb | 11 + .../projects/update_pages_service_spec.rb | 29 - spec/support/helpers/kubernetes_helpers.rb | 33 +- .../features/error_tracking_shared_context.rb | 27 + .../policies/project_policy_shared_context.rb | 8 +- .../features/error_tracking_shared_example.rb | 84 + .../snippet_visibility_shared_examples.rb | 8 +- 144 files changed, 287616 insertions(+), 31640 deletions(-) create mode 100644 app/controllers/concerns/page_limiter.rb create mode 100644 app/views/explore/projects/page_out_of_bounds.html.haml delete mode 100644 app/views/notify/note_project_snippet_email.html.haml delete mode 100644 app/views/notify/note_project_snippet_email.text.erb rename app/views/notify/{note_personal_snippet_email.html.haml => note_snippet_email.html.haml} (100%) rename app/views/notify/{note_personal_snippet_email.text.erb => note_snippet_email.text.erb} (100%) create mode 100644 changelogs/unreleased/29987-revert-groups-overview-font-spacing-to-the-old-more-space-efficient.yml create mode 100644 changelogs/unreleased/36749-explore-projectscontroller-index-latency.yml create mode 100644 changelogs/unreleased/39509-todos-should-not-depend-on-gitaly-calls.yml create mode 100644 changelogs/unreleased/get_deployments_for_kubernetes_1-16.yml create mode 100644 changelogs/unreleased/graphiql_relative_url.yml create mode 100644 locale/ku_TR/gitlab.po create mode 100644 locale/ml_IN/gitlab.po create mode 100644 locale/ur_PK/gitlab.po create mode 100644 locale/uz_UZ/gitlab.po create mode 100644 spec/controllers/concerns/page_limiter_spec.rb create mode 100644 spec/features/error_tracking/user_sees_error_details_spec.rb create mode 100644 spec/features/error_tracking/user_sees_error_index_spec.rb create mode 100644 spec/support/shared_contexts/features/error_tracking_shared_context.rb create mode 100644 spec/support/shared_examples/features/error_tracking_shared_example.rb diff --git a/.gitlab/ci/global.gitlab-ci.yml b/.gitlab/ci/global.gitlab-ci.yml index 121ce76d1dd..6943f51047c 100644 --- a/.gitlab/ci/global.gitlab-ci.yml +++ b/.gitlab/ci/global.gitlab-ci.yml @@ -13,7 +13,7 @@ .default-before_script: before_script: - date - - '[ "$FOSS_ONLY" = "1" ] && rm -rf ee/' + - '[ "$FOSS_ONLY" = "1" ] && rm -rf ee/ qa/spec/ee/ qa/qa/specs/features/ee/ qa/qa/ee/ qa/qa/ee.rb' - export GOPATH=$CI_PROJECT_DIR/.go - mkdir -p $GOPATH - source scripts/utils.sh diff --git a/.gitlab/ci/qa.gitlab-ci.yml b/.gitlab/ci/qa.gitlab-ci.yml index effc950f3c8..c950c219c96 100644 --- a/.gitlab/ci/qa.gitlab-ci.yml +++ b/.gitlab/ci/qa.gitlab-ci.yml @@ -40,7 +40,7 @@ paths: - vendor/ruby before_script: - - '[ "$FOSS_ONLY" = "1" ] && rm -rf ee/' + - '[ "$FOSS_ONLY" = "1" ] && rm -rf ee/ qa/spec/ee/ qa/qa/specs/features/ee/ qa/qa/ee/ qa/qa/ee.rb' - cd qa/ - bundle install --clean --jobs=$(nproc) --path=vendor --retry=3 --quiet - bundle check @@ -50,6 +50,13 @@ qa:internal: script: - bundle exec rspec +qa:internal-foss: + extends: + - .qa-job-base + - .only-ee-as-if-foss + script: + - bundle exec rspec + qa:selectors: extends: .qa-job-base script: diff --git a/app/assets/javascripts/groups/components/group_folder.vue b/app/assets/javascripts/groups/components/group_folder.vue index e885b2b5f41..cf8c9bf74ec 100644 --- a/app/assets/javascripts/groups/components/group_folder.vue +++ b/app/assets/javascripts/groups/components/group_folder.vue @@ -44,7 +44,7 @@ export default { :action="action" />
  • - + {{ moreChildrenStats }}
  • diff --git a/app/assets/javascripts/groups/components/group_item.vue b/app/assets/javascripts/groups/components/group_item.vue index ede74d18ed4..af9399a37bd 100644 --- a/app/assets/javascripts/groups/components/group_item.vue +++ b/app/assets/javascripts/groups/components/group_item.vue @@ -91,7 +91,7 @@ export default {