# Conflicts:
#	Gemfile.rails5.lock
#	db/schema.rb
#	locale/gitlab.pot

[ci skip]

CE upstream - 2018-06-08 12:25 UTC

Closes #5974, gitlab-qa#251, and gitlab-qa#258

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

Updates templates for 11.0

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

[Rails5] Update Gemfile lock-files

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

Use same gem versions for rails5 as for rails4 where possible

Closes #47370, #46232, #47367, and #47373

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

Update settings section titles

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

Update the dependencies license list

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

Revert rename allow collaboration column

Closes #47566

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

Merge branch '45400-automatically-created-mr-uses-wrong-target-branch-when-branching-from-tag' into 'master'

Resolve "Automatically created MR uses wrong target branch (when branching from Tag)"

Closes #45400

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

# Conflicts:
#	app/assets/javascripts/boards/models/list.js
#	app/assets/javascripts/boards/stores/boards_store.js
#	app/finders/issues_finder.rb
#	app/services/boards/lists/create_service.rb
#	app/views/projects/settings/ci_cd/_autodevops_form.html.haml
#	app/views/shared/issuable/_search_bar.html.haml

[ci skip]

Use RestoreCustomHooks RPC in restore rake task

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

CE upstream - 2018-06-07 18:23 UTC

Closes #6216

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

Fix NotificationRecipientService spec for EE

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

Backport of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/5876/

Closes #5974

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

Remove Gitlab::Popen dependency from lib/gitlab/git

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

EE checks a license, which needs RequestStore enabled to avoid N+1
queries. However, enabling RequestStore causes Gitaly to complain about N+1
invocations, which we really don't care about here.

Automate the basic API tests in a QA scenario

Closes gitlab-qa#251

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

[EE] Automate the basic API tests in a QA scenario

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

EE checks a license, which needs RequestStore enabled to avoid N+1
queries. However, enabling RequestStore causes Gitaly to complain about N+1
invocations, which we really don't care about here.

Allow IDE pipeline panel to be resizable

Closes #47538

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

Resolve "Geo: Improve no downtime upgrade documentation"

Closes #5936

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

Backport changes for Housekeeping Specs

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

# Conflicts:
#   spec/factories/project_auto_devops.rb