# Conflicts:
#	Gemfile.lock
#	doc/README.md
#	doc/development/README.md

[ci skip]

Revert discussion counter height

Closes #45896

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

CE upstream - 2018-04-30 09:25 UTC

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

Fixed inconsistent protected branch pill baseline

Closes #41286 and #45354

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

Sanitize user name to avoid XSS attacks

See merge request gitlab/gitlabhq!2373

Serve archive requests with the correct file in all cases (10.7)

See merge request gitlab/gitlabhq!2376

Skip `authenticate_user!` for Doorkeeper controllers

Closes #44639

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

Use fast timeouts for Gitaly FooInProgress RPC's

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

Avoid conflicts with gitlab-ce!18269

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

Add developer documentation on diff handling and limits

Closes #43614

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

Use grpc 1.11.0

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

Use grpc 1.11.0 (EE version)

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

Backports EE changes from disabling branch unprotect UI

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

Branch unprotection restrictions disable UI

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

Don't automatically remove artifacts for pages jobs after pages:deploy has run

Closes #45481

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

Use GitLab Pages v0.9.1

Closes #45639

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

Makes namespaceless project destroy worker spec not depend on a specific migration version

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

Docs: review product categories in doc/README

Closes #45496

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

Docs: review product categories in doc/README

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

Remove legacy storage path call

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

Since we only need the `can?` view helpers there, it's better to
include those in a separate controller.

If we inherit from `ApplicationController` we also need to deal with
authentication, that needs to be done in some, but not all doorkeeper controllers.

# Conflicts:
#	app/models/members/group_member.rb
#	app/models/members/project_member.rb
#	app/services/notification_service.rb
#	config/initializers/omniauth.rb

[ci skip]

Update index.md

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

Fix typo

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

Ports omniauth-jwt gem onto GitLab OmniAuth Strategies suite

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