# Conflicts:
#	spec/controllers/projects/issues_controller_spec.rb

CE upstream: Friday

Closes gitaly#372, gitaly#396, gitlab-qa#57, and gitaly#381

See merge request !2496

Cleans up mirror capacity if project is a scheduled mirror

See merge request !2445

Check license before showing Jenkins in list of integrations

Closes #2847

See merge request !2459

Add enter keyboard shortcut to submit Related Issues form

Closes #2925

See merge request !2465

Improve text for codeclimate report

Closes #2951

See merge request !2493

We updated grape from 0.19.0 to 0.19.2, the diff is:

https://github.com/ruby-grape/grape/compare/v0.19.0...v0.19.2

This was introduced in grape 0.19.1:

* [#1550](https://github.com/ruby-grape/grape/pull/1550): Use 200 as default status for deletes that reply with content - [@jthornec](https://github.com/jthornec).

So now we need to be explicit about the status.

Edit Add GitLab Trello Power-Up Documentation (EE)

See merge request !2499

[ci skip]

[ci skip]

Add GitLab Trello Power-Up Documentation

See merge request !12997

Remove suggested approvers text decoration on hover

Closes #2607

See merge request !2487

Fix transient test failure in protected_branches_access_control_ee.rb

See merge request !2439

Fix https://gitlab.com/gitlab-org/gitlab-ee/issues/2925

[Backport] Recommend V4 API usage on chat slash command integrations

See merge request !2494

* upstream/master: (54 commits)
  Add 1px to breadcrumbs min height
  Merge branch 'fix-re2-infinite-loop-nick' into 'security-9-3'
  Copy-edit background migrations guidelines
  Add Traditional Chinese in Taiwan translations of Pipeline Schedules
  Fix new project selectors in GitLab QA
  add screenshots
  review troll powerup doc
  Improve version handling on component install tasks
  Add disclaimer about API scope
  Migrate Gitlab::Git::Commit.find_all to Gitaly
  Refactor filtered search dropdown parameters
  Spread used props
  Update CHANGELOG.md for 9.0.12
  Update CHANGELOG.md for 9.1.9
  Update CHANGELOG.md for 9.2.9
  Move a spec related to merge requests out of a feature related to issues
  Update CHANGELOG.md for 9.3.9
  Incorporate CommitService.GetTreeEntries Gitaly call
  Extract "@request.env['devise.mapping'] = Devise.mappings[:user]" to a test helper
  Bump Gitlab-Shell to 5.4.0
  ...

Include whether the actor is a GeoNode in the `/internal/allowed` endpoint

See merge request !2489

Add 1px to breadcrumbs min height

See merge request !13020

Incorporate CommitService.GetTreeEntries Gitaly call

Closes gitaly#372

See merge request !12941

Extract "@request.env['devise.mapping'] = Devise.mappings[:user]" to a test helper

Closes #34549

See merge request !12742

Move a spec related to merge requests out of a feature related to issues

See merge request !13002

CE upstream: Thursday

Closes gitlab-com/support-forum#2246

See merge request !2486

Migrate Gitlab::Git::Commit.find_all to Gitaly

Closes gitaly#396

See merge request !12934

Developer can just download the patch from the `ee_compat_check` job's artifact

See merge request !12967

Recommend V4 API usage on chat slash command integrations

Closes #28975

See merge request !12954

Docs: update Geo with upgrade instructions

See merge request !2491

Merge branch '34788-testenv-doesn-t-update-the-component-correctly-when-a-branch-is-specified' into 'master'

Improve version handling on component install tasks

Closes #34788

See merge request !13006