Commits · 8dc671188a351e7a446deadafd7c110a50051aa4 · nexedi / gitlab-ce

14 Apr, 2021 40 commits
- Merge canonical into security master · 8dc67118
  Yorick Peterse authored Apr 14, 2021
  
  8dc67118
- Merge branch... · 593568df
  Kamil Trzciński authored Apr 14, 2021
```
Merge branch '300021-rollout-serving-migrated-data-feature-flag-pages_serve_from_migrated_zip' into 'master'

Remove pages_serve_from_migrated_zip feature flag [RUN ALL RSPEC] [RUN AS-IF-FOSS]

See merge request gitlab-org/gitlab!59002
```
  593568df
- Update CHANGELOG.md for 13.10.3-ee · 522037d0
  GitLab Release Tools Bot authored Apr 13, 2021
```
[ci skip]
```
  522037d0
- Update CHANGELOG-EE.md for 13.10.3-ee · 67c00c0b
  GitLab Release Tools Bot authored Apr 13, 2021
```
[ci skip]
```
  67c00c0b
- Update CHANGELOG.md for 13.9.6-ee · 6e121db1
  GitLab Release Tools Bot authored Apr 13, 2021
```
[ci skip]
```
  6e121db1
- Update CHANGELOG-EE.md for 13.9.6-ee · c780f2f0
  GitLab Release Tools Bot authored Apr 13, 2021
```
[ci skip]
```
  c780f2f0
- Update CHANGELOG.md for 13.8.8-ee · c15e0fa1
  GitLab Release Tools Bot authored Apr 13, 2021
```
[ci skip]
```
  c15e0fa1
- Update CHANGELOG-EE.md for 13.8.8-ee · 308b3d83
  GitLab Release Tools Bot authored Apr 13, 2021
```
[ci skip]
```
  308b3d83
- Check content type before running exiftool · 84c6b352
  Jan Provaznik authored Apr 08, 2021
```
Assures that exiftool runs for jpeg/tiff images only.
```
  84c6b352
- Detect file MIME type before checking exif headers · 1a4235b3
  charlie ablett authored Apr 08, 2021
```
Before running exiftool from rake task, file's MIME type is checked.
```
  1a4235b3
- Update ruby-saml and rexml gems · 1b6d9e45
  Alex Pooley authored Apr 08, 2021
  
  1b6d9e45
- Allow to disable exiftool if env variable is set · b36d99f9
  Jan Provaznik authored Apr 07, 2021
```
This allows more flexible way to enable/disable exiftool
```
  b36d99f9
- Merge branch 'nhxnguyen-geo-terms-registry' into 'master' · e20fd68c
  Valery Sizov authored Apr 14, 2021
```
Change node to site for Geo docker registry docs

See merge request gitlab-org/gitlab!57285
```
  e20fd68c
- Change node to site for Geo docker registry docs · 2a87508e
  Nick Nguyen authored Apr 14, 2021
  
  2a87508e
- Merge branch '300115-support-negated-issue-filters-gql' into 'master' · 5a83a8b6
  Heinrich Lee Yu authored Apr 14, 2021
```
Support negated filtering in IssueResolvers

See merge request gitlab-org/gitlab!58154
```
  5a83a8b6
- Merge branch 'deploy-tokens-rails-way' into 'master' · 19c6e0e8
  Enrique Alcántara authored Apr 14, 2021
```
Replace label_tag with form.label in Deploy Token UI

See merge request gitlab-org/gitlab!59222
```
  19c6e0e8
- Merge remote-tracking branch 'dev/master' · f65f0914
  GitLab Release Tools Bot authored Apr 14, 2021
  
  f65f0914
- Merge branch '326344-fj-add-scope-menu-to-sidebar-refactor' into 'master' · 9bceafeb
  Denys Mishunov authored Apr 14, 2021
```
Add scope menu to project sidebar refactor

See merge request gitlab-org/gitlab!58761
```
  9bceafeb
- Merge remote-tracking branch 'dev/master' · ca8d3929
  GitLab Release Tools Bot authored Apr 14, 2021
  
  ca8d3929
- Merge branch 'vs-move-countries-states-to-gql' into 'master' · 9e87ef28
  Miguel Rincon authored Apr 14, 2021
```
Add countries and states to local resolvers for the purchase flow

See merge request gitlab-org/gitlab!59012
```
  9e87ef28
- Merge branch '288343-show-full-treeview' into 'master' · ef92d8bf
  Phil Hughes authored Apr 14, 2021
```
Fix MR diff file tree being hidden behind review bar

See merge request gitlab-org/gitlab!59150
```
  ef92d8bf
- Merge branch '323676-add-index-on-web-hook-id-to-partitioned-web-hook-logs' into 'master' · f654bb35
  Andreas Brandl authored Apr 14, 2021
```
Add index on web_hook_id to partitioned web_hook_logs (Part 2 of 3)

See merge request gitlab-org/gitlab!59266
```
  f654bb35
- Merge branch '231401-epic-board-sidebar-edit-notifications' into 'master' · 15fea8a4
  Kushal Pandya authored Apr 14, 2021
```
Epic board sidebar - Edit subscribed state [RUN AS-IF-FOSS]

See merge request gitlab-org/gitlab!59214
```
  15fea8a4
- Automatic merge of gitlab-org/gitlab master · e3b7bfd9
  GitLab Bot authored Apr 14, 2021
  
  e3b7bfd9
- Merge branch 'pks-workhorse-go-1.16' into 'master' · 06ab148d
  Nick Thomas authored Apr 14, 2021
```
Bump minimum required Go version for Workhorse to 1.15

See merge request gitlab-org/gitlab!59347
```
  06ab148d
- Merge branch 'dpisek-generic-reports-grid-cleanup' into 'master' · cf587293
  Natalia Tepluhina authored Apr 14, 2021
```
Generic vulnerability reports: Remove extra margin between report columns

See merge request gitlab-org/gitlab!58720
```
  cf587293
- Merge branch '326225-add-sidekiq-lb-server-metrics' into 'master' · b3b3c59b
  Kamil Trzciński authored Apr 14, 2021
```
Add load balancing Prometheus metrics in server_metrics middleware

See merge request gitlab-org/gitlab!58473
```
  b3b3c59b
- Add load balancing Prometheus metrics in server_metrics middleware · 926bb603
  Nikola Milojevic authored Apr 14, 2021
  
  926bb603
- Merge branch 'ui-text-discord-integration' into 'master' · f379f644
  Dmytro Zaporozhets (DZ) authored Apr 14, 2021
```
Update Discord integration UI text

See merge request gitlab-org/gitlab!58842
```
  f379f644
- Update Discord integration UI text · 5a3d7651
  Marcel Amirault authored Apr 14, 2021
  
  5a3d7651
- Merge branch '31063-ensure-diff-collection-limits-are-configurable' into 'master' · 2b6e5cab
  Patrick Bajao authored Apr 14, 2021
```
Resolve "Ensure diff collection limits are monitorable and configurable"

See merge request gitlab-org/gitlab!57790
```
  2b6e5cab
- Merge branch '325541_subscription_details_view_graphql' into 'master' · 21e5c8d0
  James Lopez authored Apr 14, 2021
```
Introduce Cloud License related GraphQL types

See merge request gitlab-org/gitlab!57382
```
  21e5c8d0
- Introduce Cloud License related GraphQL types · b4d7c836
  Corinna Wiesner authored Apr 14, 2021
  
  b4d7c836
- Merge branch 'rspec-empty-line-after-letitbe-ee-spec-controllers-registrations' into 'master' · 353b57c4
  Patrick Bajao authored Apr 14, 2021
```
Fix RSpec/EmptyLineAfterFinalLetItBe for ee registrations controllers

See merge request gitlab-org/gitlab!58408
```
  353b57c4
- Merge branch '326225-add-load-balancing-metrics-on-request-level' into 'master' · 83ec2279
  Kamil Trzciński authored Apr 14, 2021
```
Add metric to track querying write location on Request level

See merge request gitlab-org/gitlab!58673
```
  83ec2279
- Add metric to track querying write location on Request level · 3b66b5e9
  Nikola Milojevic authored Apr 14, 2021
  
  3b66b5e9
- Merge branch 'issue#325836-fix-empty-line-after-let-it-be-services-environments' into 'master' · ffdeadff
  Matthias Käppler authored Apr 14, 2021
```
Fix EmptyLineAfterFinalLetItBe offenses in spec/services/environments

See merge request gitlab-org/gitlab!58418
```
  ffdeadff
- Fix EmptyLineAfterFinalLetItBe offenses in spec/services/environments · 25ec415a
  Huzaifa Iftikhar authored Apr 14, 2021
  
  25ec415a
- Merge branch 'issue#325836-fix-empty-line-after-let-it-be-services-award-emojis' into 'master' · 07566d4f
  Matthias Käppler authored Apr 14, 2021
```
Fix EmptyLineAfterFinalLetItBe offenses in spec/services/award_emojis

See merge request gitlab-org/gitlab!58407
```
  07566d4f
- Fix EmptyLineAfterFinalLetItBe offenses in spec/services/award_emojis · a8d099c4
  Huzaifa Iftikhar authored Apr 14, 2021
  
  a8d099c4