# Conflicts:
#	app/assets/javascripts/boards/index.js
#	app/helpers/blob_helper.rb
#	app/views/projects/blob/_header.html.haml
#	app/views/projects/edit.html.haml
#	app/views/projects/tree/_tree_header.html.haml
#	config/gitlab.yml.example
#	config/sidekiq_queues.yml
#	config/webpack.config.js
#	db/schema.rb
#	qa/qa/page/merge_request/show.rb
#	spec/helpers/issuables_helper_spec.rb
#	spec/support/db_cleaner.rb

[ci skip]

Merged CE boards-bundle-refactor into EE

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

CE: Fix multiple assignees avatar alignment in issues list

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

Fix multiple assignees avatar alignment in issues list

Closes #5013

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

Suppress whitespace warnings in squash error messages

Closes gitlab-ee#3639

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

Resolve "Refactoring of blob link methods in blob_helper"

Closes #41255

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

[EE] Resolve "Refactoring of blob link methods in blob_helper"

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

Clarify when disabling Gitaly makes sense

Closes #43551

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

Correcting documentation about project hooks settings

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

Extract WaitableWorker out of AuthorizedProjectsWorker

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

[EE] Extract WaitableWorker out of AuthorizedProjectsWorker

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

Get rid of hard-coded user/project/group names that could clash with DB sequences

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

Port of pages custom domain DNS verification to EE

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

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

CE upstream - 2018-02-23 15:23 UTC

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

Fix bug causing 'Import in progress' to be shown while a mirror is updating

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

[EE] Don't convert issuable_initial_data into JSON

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

Don't convert issuable_initial_data into JSON

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

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

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

IDE create new branch

Closes #4545

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

Fix Group labels load failure when there are duplicate labels present

Closes #43598

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

Respond with more appropriate HTTP status code when repo does not exist

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

Restart Unicorn and Sidekiq when GRPC throws 14:Endpoint read failed

Closes gitaly#1036

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

[EE] Verify project import status again before marking as failed

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

Instead of converting hash into JSON inside
issuable_initial_data method, return hash and convert
to JSON later. This allows us to easily extend basic
issuable data with resource specific values. For example
for Epic these data should include also labels, so we can then
do something like:
issuable_initial_data(@epic).merge(labels: @epic.labels).to_json

Instead of converting hash into JSON inside
issuable_initial_data method, return hash and convert
to JSON later. This allows us to easily extend basic
issuable data with resource specific values. For example
for Epic these data should include also labels, so we can then
do something like:
issuable_initial_data(@epic).merge(labels: @epic.labels).to_json

These are obscuring the real error, which is confusing for everyone.