From ad9eb72915f1be40da3ebe287274fe2bae62e46b Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 5 Aug 2020 21:09:40 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- CHANGELOG.md | 45 +++- GITALY_SERVER_VERSION | 2 +- GITLAB_SHELL_VERSION | 2 +- Gemfile | 2 +- Gemfile.lock | 4 +- .../components/grafana_integration.vue | 10 +- .../jobs/components/environments_block.vue | 255 +++++++----------- .../jobs/components/stuck_block.vue | 71 +++-- .../snippets/components/snippet_header.vue | 9 +- .../enforces_two_factor_authentication.rb | 9 +- .../oauth/applications_controller.rb | 3 - .../oauth/authorizations_controller.rb | 2 +- .../authorized_applications_controller.rb | 2 +- .../oauth/token_info_controller.rb | 2 + app/controllers/oauth/tokens_controller.rb | 5 + .../repositories/lfs_storage_controller.rb | 5 +- app/helpers/issuables_helper.rb | 2 +- app/mailers/emails/members.rb | 17 +- app/models/clusters/applications/runner.rb | 2 +- app/models/clusters/cluster.rb | 27 +- app/serializers/cluster_entity.rb | 4 + app/serializers/cluster_error_entity.rb | 7 + app/serializers/cluster_serializer.rb | 1 + .../project_group_link_create_service.rb | 18 +- app/services/groups/transfer_service.rb | 11 + .../projects/group_links/create_service.rb | 7 +- .../sast_ui_schema.json | 2 +- .../project_group_link_create_worker.rb | 7 +- app/workers/authorized_projects_worker.rb | 3 + ...-file-call-from-lfs-storage-controller.yml | 5 + .../unreleased/220303-public-snippet.yml | 5 + ...e-stuck_block-component-to-use-glbadge.yml | 5 + ...d_dashboard_path_to_prometheus_metrics.yml | 5 + .../unreleased/sh-update-gitlab-shell.yml | 5 + ...ate-gitlab-runner-helm-chart-to-0-19-2.yml | 5 + config/routes.rb | 3 +- ...dd_dashboard_path_to_prometheus_metrics.rb | 14 + ...210506_add_text_limit_to_dashboard_path.rb | 17 ++ db/schema_migrations/20200729175935 | 1 + db/schema_migrations/20200730210506 | 1 + db/structure.sql | 4 +- .../graphql/img/sample_issue_boards_v13_2.png | Bin 0 -> 93727 bytes doc/api/graphql/index.md | 10 +- doc/api/graphql/sample_issue_boards.md | 44 +++ doc/ci/yaml/README.md | 4 - doc/development/documentation/structure.md | 34 ++- doc/development/documentation/styleguide.md | 62 ++--- doc/push_rules/push_rules.md | 7 + ...import_decompressed_archive_size_limits.md | 28 ++ doc/user/project/integrations/jira.md | 4 +- lib/banzai/filter/label_reference_filter.rb | 2 + lib/banzai/filter/reference_filter.rb | 1 - lib/gitlab/base_doorkeeper_controller.rb | 2 + lib/gitlab/checks/branch_check.rb | 12 +- .../ci/config/entry/product/parallel.rb | 2 +- lib/gitlab/ci/config/normalizer/factory.rb | 6 +- lib/gitlab/ci/features.rb | 4 - .../decompressed_archive_size_validator.rb | 90 +++++++ lib/gitlab/import_export/file_importer.rb | 9 + lib/gitlab/kubernetes/kube_client.rb | 8 +- lib/gitlab/kubernetes/node.rb | 21 +- lib/gitlab/markdown_cache.rb | 2 +- locale/gitlab.pot | 18 +- .../oauth/applications_controller_spec.rb | 27 ++ .../oauth/authorizations_controller_spec.rb | 92 ++++--- ...authorized_applications_controller_spec.rb | 20 ++ .../oauth/token_info_controller_spec.rb | 4 + .../oauth/tokens_controller_spec.rb | 9 + .../lfs_storage_controller_spec.rb | 160 +++++++++++ spec/features/projects/jobs_spec.rb | 18 +- .../grafana_integration_spec.js.snap | 18 +- .../components/grafana_integration_spec.js | 7 +- .../components/environments_block_spec.js | 70 ++--- .../jobs/components/stuck_block_spec.js | 4 +- .../components/snippet_header_spec.js | 104 ++++--- spec/helpers/issuables_helper_spec.rb | 8 + .../filter/issue_reference_filter_spec.rb | 6 + spec/lib/gitlab/checks/branch_check_spec.rb | 23 ++ ...ecompressed_archive_size_validator_spec.rb | 58 ++++ .../import_export/file_importer_spec.rb | 39 +++ .../import_export/safe_model_attributes.yml | 1 + .../lib/gitlab/kubernetes/kube_client_spec.rb | 16 +- spec/lib/gitlab/kubernetes/node_spec.rb | 52 ++-- spec/mailers/notify_spec.rb | 18 ++ spec/models/clusters/cluster_spec.rb | 83 +++++- spec/requests/lfs_http_spec.rb | 18 +- spec/serializers/cluster_error_entity_spec.rb | 35 +++ spec/serializers/cluster_serializer_spec.rb | 1 + .../project_group_link_create_service_spec.rb | 23 +- spec/services/groups/transfer_service_spec.rb | 119 ++++++-- .../group_links/create_service_spec.rb | 7 +- 91 files changed, 1512 insertions(+), 504 deletions(-) create mode 100644 app/controllers/oauth/tokens_controller.rb create mode 100644 app/serializers/cluster_error_entity.rb create mode 100644 changelogs/unreleased/213289-remove-uploaded-file-call-from-lfs-storage-controller.yml create mode 100644 changelogs/unreleased/220303-public-snippet.yml create mode 100644 changelogs/unreleased/230734-change-stuck_block-component-to-use-glbadge.yml create mode 100644 changelogs/unreleased/rc-add_dashboard_path_to_prometheus_metrics.yml create mode 100644 changelogs/unreleased/sh-update-gitlab-shell.yml create mode 100644 changelogs/unreleased/update-gitlab-runner-helm-chart-to-0-19-2.yml create mode 100644 db/migrate/20200729175935_add_dashboard_path_to_prometheus_metrics.rb create mode 100644 db/migrate/20200730210506_add_text_limit_to_dashboard_path.rb create mode 100644 db/schema_migrations/20200729175935 create mode 100644 db/schema_migrations/20200730210506 create mode 100644 doc/api/graphql/img/sample_issue_boards_v13_2.png create mode 100644 doc/api/graphql/sample_issue_boards.md create mode 100644 doc/security/project_import_decompressed_archive_size_limits.md create mode 100644 lib/gitlab/import_export/decompressed_archive_size_validator.rb create mode 100644 spec/controllers/oauth/tokens_controller_spec.rb create mode 100644 spec/controllers/repositories/lfs_storage_controller_spec.rb create mode 100644 spec/lib/gitlab/import_export/decompressed_archive_size_validator_spec.rb create mode 100644 spec/serializers/cluster_error_entity_spec.rb diff --git a/CHANGELOG.md b/CHANGELOG.md index 0b320e66535..c11311d3d07 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,21 @@ entry. ## 13.2.3 (2020-08-05) -- No changes. +### Security (12 changes) + +- Update kramdown gem to version 2.3.0. +- Enforce 2FA on Doorkeeper controllers. +- Revoke OAuth grants when a user revokes an application. +- Refresh project authorizations when transferring groups. +- Stop excess logs from failure to send invite email when group no longer exists. +- Verify confirmed email for OAuth Authorize POST endpoint. +- Fix XSS in Markdown reference tooltips. +- Fix XSS in milestone tooltips. +- Fix xss vulnerability on jobs view. +- Block 40-character hexadecimal branches. +- Prevent a temporary access escalation before group memberships are recalculated when specialized project share workers are enabled. +- Update GitLab Runner Helm Chart to 0.18.2. + ## 13.2.2 (2020-07-29) @@ -1035,7 +1049,20 @@ entry. ## 13.1.6 (2020-08-05) -- No changes. +### Security (11 changes) + +- Add decompressed archive size validation on Project/Group Import. !562 +- Enforce 2FA on Doorkeeper controllers. +- Refresh project authorizations when transferring groups. +- Stop excess logs from failure to send invite email when group no longer exists. +- Verify confirmed email for OAuth Authorize POST endpoint. +- Revoke OAuth grants when a user revokes an application. +- Fix XSS in Markdown reference tooltips. +- Fix XSS in milestone tooltips. +- Fix xss vulnerability on jobs view. +- Block 40-character hexadecimal branches. +- Update GitLab Runner Helm Chart to 0.17.2. + ## 13.1.5 (2020-07-23) @@ -1573,7 +1600,19 @@ entry. ## 13.0.12 (2020-08-05) -- No changes. +### Security (10 changes) + +- Add decompressed archive size validation on Project/Group Import. !562 +- Enforce 2FA on Doorkeeper controllers. +- Refresh project authorizations when transferring groups. +- Stop excess logs from failure to send invite email when group no longer exists. +- Verify confirmed email for OAuth Authorize POST endpoint. +- Revoke OAuth grants when a user revokes an application. +- Fix XSS in Markdown reference tooltips. +- Fix XSS in milestone tooltips. +- Fix xss vulnerability on jobs view. +- Block 40-character hexadecimal branches. + ## 13.0.11 (2020-08-05) diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index 5cbd1279d16..2c46e56f22d 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -c6fdcae2d1c5d4914a010dfe7ea5dbfcfb8bdabf +1bd1bfa6673eb784b856d580240f8e5522b86467 diff --git a/GITLAB_SHELL_VERSION b/GITLAB_SHELL_VERSION index 74302c5119c..d224e69099c 100644 --- a/GITLAB_SHELL_VERSION +++ b/GITLAB_SHELL_VERSION @@ -1 +1 @@ -13.4.0 +13.5.0 diff --git a/Gemfile b/Gemfile index 9a23c4f7d11..8ef21d1e4e4 100644 --- a/Gemfile +++ b/Gemfile @@ -144,7 +144,7 @@ gem 'deckar01-task_list', '2.3.1' gem 'gitlab-markup', '~> 1.7.1' gem 'github-markup', '~> 1.7.0', require: 'github/markup' gem 'commonmarker', '~> 0.20' -gem 'kramdown', '~> 2.2.1' +gem 'kramdown', '~> 2.3.0' gem 'RedCloth', '~> 4.3.2' gem 'rdoc', '~> 6.1.2' gem 'org-ruby', '~> 0.9.12' diff --git a/Gemfile.lock b/Gemfile.lock index 257cfb6b52c..79f2d31bbf6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -598,7 +598,7 @@ GEM kgio (2.11.3) knapsack (1.17.0) rake - kramdown (2.2.1) + kramdown (2.3.0) rexml kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) @@ -1308,7 +1308,7 @@ DEPENDENCIES jwt (~> 2.1.0) kaminari (~> 1.0) knapsack (~> 1.17) - kramdown (~> 2.2.1) + kramdown (~> 2.3.0) kubeclient (~> 4.6.0) letter_opener_web (~> 1.3.4) license_finder (~> 5.4) diff --git a/app/assets/javascripts/grafana_integration/components/grafana_integration.vue b/app/assets/javascripts/grafana_integration/components/grafana_integration.vue index 86ac3a5b580..8d1e542b8ad 100644 --- a/app/assets/javascripts/grafana_integration/components/grafana_integration.vue +++ b/app/assets/javascripts/grafana_integration/components/grafana_integration.vue @@ -1,11 +1,11 @@ diff --git a/app/assets/javascripts/snippets/components/snippet_header.vue b/app/assets/javascripts/snippets/components/snippet_header.vue index be4efd10e45..feae17ccc23 100644 --- a/app/assets/javascripts/snippets/components/snippet_header.vue +++ b/app/assets/javascripts/snippets/components/snippet_header.vue @@ -68,6 +68,11 @@ export default { snippetHasBinary() { return Boolean(this.snippet.blobs.find(blob => blob.binary)); }, + authoredMessage() { + return this.snippet.author + ? __('Authored %{timeago} by %{author}') + : __('Authored %{timeago}'); + }, personalSnippetActions() { return [ { @@ -178,8 +183,8 @@ export default { -
- +
+