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

[ci skip]

Store sha256 checksum of Metadata in `ci_job_artifacts` table

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

Remove Rake test_ci task

Closes #44902

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

Upgrade Gitaly server verion

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

Update the 'Database Changes' MR template to add a step for QA

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

Merge branch '44254-codequality-jobs-are-failing-silently-with-an-empty-codeclimate-json-file' into 'master'

Resolve "codequality jobs are failing silently with an empty codeclimate.json file"

Closes #44254

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

Refactor discussions/notes code

Closes #42148

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

[EE] Epic comment thread

Closes gitlab-ce#42148

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

Resolve "Disabling two factor authentication via gitlab-rake fails"

Closes #44425

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

CE upstream - 2018-04-03 12:31 UTC

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

[Rails5] Allow using `RAILS5` env with rspec

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

Re-enable allowing n+1 Gitaly for branches index

Closes #44861

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

Use project path in package-and-qa to fetch script

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

* ask_to_continue
* Gitlab::TaskAbortedByUserError

Use project path in package-and-qa to fetch script

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

Fix wrong error handling in update page service

Closes #44817

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

Signed-off-by: Rémy Coutable <remy@rymai.me>

Add documentation about backporting changes from EE to CE

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

Always allow the performance bar to be enabled for admins

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

Replace the `project/issues/labels.feature` spinach test with an rspec analog

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

Settings page for Per Group SAML

Closes #4513

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

Resolve "Wrong user in push notification email"

Closes #44921

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

# Conflicts:
#	doc/ci/examples/browser_performance.md

[ci skip]

Merge branch '5431-geo-pagesdomainverificationworker-can-start-up-on-secondaries-if-db-is-down' into 'master'

Resolve "Geo: PagesDomainVerificationWorker can start up on secondaries if DB is down"

Closes #5431

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

This was sending the current user, which is the recipient! It should be the user
who pushed the commits.

Do not retry package-and-qa manual action on failure

Closes #44882

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

`overlay2` is more recent and stable than `overlay`

SamlProvider defaults to enabled, validates fields, can create/update, displays info to user
SamlProvider requires top level group
License and policy checks for SamlProvidersController

CE upstream - 2018-04-02 21:40 UTC

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

icu4c had another version bump, which broken compilation of the native
extensions of charlock_holmes. Gitaly has upgraded the gem version, and
with this made installation against the new lib version, 61.1, available
again.

Geo: Migrate CI artifacts into their own registry table

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