# Conflicts:
#	app/models/clusters/platforms/kubernetes.rb
#	app/views/projects/blob/_blob.html.haml

[ci skip]

Add terminal path to job API response

Closes #51117

See merge request gitlab-org/gitlab-ce!21537

Make MR diff file filter input Clear button functional

Closes #51092

See merge request gitlab-org/gitlab-ce!21556

Add CI Job token support to Maven packages API

See merge request gitlab-org/gitlab-ee!7249

Add git_v2 flag to GitalyClient

See merge request gitlab-org/gitlab-ce!21520

closes #51117

Fix attachments not displaying inline with Google Cloud Storage

Closes #49957

See merge request gitlab-org/gitlab-ce!21265

Docs: Point "upgrade to EE" link to a dedicated page

See merge request gitlab-org/gitlab-ee!7266

Custom Action support

See merge request gitlab-org/gitlab-ce!21034

CE upstream - 2018-09-06 09:22 UTC

See merge request gitlab-org/gitlab-ee!7264

Port changes for CODEOWNERS to CE

See merge request gitlab-org/gitlab-ce!21309

Extract code owners from a CODEOWNERS file

Closes #6961

See merge request gitlab-org/gitlab-ee!6916

EE port for 29398 support kubernetes rbac for gitlab managed apps

See merge request gitlab-org/gitlab-ee!6946

Enable Kubernetes RBAC for GitLab Managed Apps for existing clusters

See merge request gitlab-org/gitlab-ce!21127

Fix usage statistics typo documentation

See merge request gitlab-org/gitlab-ce!21555

Fix usage statistics typo documentation

See merge request gitlab-org/gitlab-ee!7265

Resolve "Update presentation for SSO providers on log in page"

Closes #44943

See merge request gitlab-org/gitlab-ce!21233

# Conflicts:
#	app/assets/javascripts/pages/projects/project.js
#	app/assets/stylesheets/framework/variables.scss
#	app/finders/template_finder.rb
#	app/helpers/button_helper.rb
#	app/views/projects/_home_panel.html.haml
#	doc/user/markdown.md
#	locale/gitlab.pot

[ci skip]

Explicit hashed path check for trace, prevents background migration from…

See merge request gitlab-org/gitlab-ce!21533

- Use proper HTTP codes for /api/v4/allowed response
- CustomAction support

- if #check_custom_action!(cmd) returns something, return from #check()
- now returns :Gitlab::GitAccessResult::Success.new instead of true