# Conflicts:
#	doc/user/admin_area/settings/visibility_and_access_controls.md

[ci skip]

CE upstream - 2018-04-05 18:26 UTC

Closes #4788

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

Resolve "Show `failure_reason` and upgrade tooltips of jobs"

Closes #44269

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

Direct upload of artifacts

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

Align custom metric section header naming

Closes #5511

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

EE port of 44389-always-allow-http-for-ci-git-operations

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

Partition job_queue_duration_seconds with jobs_running_for_project

Closes #43219

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

Resolve "Allow HTTPS cloning by Runners if it is disabled for users"

Closes #44389

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

Fix `JobsController#raw` endpoint can not read traces in database

Closes #44665

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

# 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