# Conflicts:
#	app/models/project.rb
#	app/policies/merge_request_policy.rb
#	lib/api/helpers/projects_helpers.rb
#	lib/api/projects.rb
#	lib/gitlab/import_export/import_export.yml

[ci skip]

Port of EE translations

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

Adjust 404's for LegacyDiffNote discussion rendering

Closes #44295

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

Merge branch 'docs-45003-route-repository-commits-sha-merge_requests-is-broken-always-returns-404' into 'master'

Mention when "/commits/:sha/merge_requests/" endpoint was introduced

Closes #45003

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

CE upstream - 2018-04-05 12:27 UTC

Closes #4474

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

add PostgreSQL 10 to Geo CI build

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

Groups reports in MR view and splits reports in CI view

Closes #4310, #5105, #4464, and #5129

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

Resolve "Consider removing RuboCop and ESLint from `.codeclimate.yml`"

Closes #44978

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

[EE] Don't run RuboCop nor ESLint checks in the codequality job as this is already…

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

Conflicts from (CE) https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/18183
to (EE) https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/5031

Update GitLab Pages

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

Resolve HTML/CSS inconsistent comment forms on Issue and Merge Request

Closes #44870

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

Change IDE diff view responsively

Closes #44305

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

Merge branch 'ee-43098-controller-projects-issuescontroller-show-executes-more-than-100-sql-queries' into 'master'

Fix N+1 in MergeRequestParser

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

Merge branch '43098-controller-projects-issuescontroller-show-executes-more-than-100-sql-queries' into 'master'

Resolve "Controller Projects::IssuesController#show executes more than 100 SQL queries"

Closes #43098

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

(EE-Port) Override params during import

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

Allow passing params to import API to override project attributes

Closes gitlab-ee#4788

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

Port of use-chronic-duration-attribute-for-project-build-timeout

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

New Crowdin translations

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

This includes the classification label

Since we can regenerate `description_html` from the `description`, we
should not export it. This avoids some complexity when overriding the
description during an import/export where we would need to invalidate
this cached field.

Now we refresh the markdown cache after the import

read_project can be prevented by a very expensive condition, which we want to
avoid, while still not writing manual SQL queries. read_project_for_iids is used
by read_issue_iid and read_merge_request_iid to satisfy both of those
constraints, and allow the declarative policy runner to use its normal caching
strategy.

Use chronic duration attribute for project build timeout

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

read_project can be prevented by a very expensive condition, which we want to
avoid, while still not writing manual SQL queries. read_project_for_iids is used
by read_issue_iid and read_merge_request_iid to satisfy both of those
constraints, and allow the declarative policy runner to use its normal caching
strategy.

Better group support in notes-related code

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

[EE] fix label and issuable referencing in epics

Closes #5390

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

# Conflicts:
#	db/schema.rb
#	doc/administration/index.md
#	doc/user/admin_area/settings/email.md
#	spec/mailers/previews/notify_preview.rb

[ci skip]

JaCoCo example

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

Reschedule pipeline stages migration to run it again

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

* `~label` references are replaced with links to epics with this label
* cross-reference system note is created when an issuable is
referenced in a epic note (or when an issuable references an epic)

Related to #5390

Updates notes-related services and rendering so this code can be
easily used for group-scoped resources (specifically Epics).

Related to gitlab-ee!5205

Web IDE markdown preview

Closes #44843

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