# Conflicts:
#	app/assets/javascripts/vue_merge_request_widget/dependencies.js
#	doc/user/project/web_ide/img/commit_changes.png
#	doc/user/project/web_ide/index.md
#	qa/qa/page/merge_request/show.rb

[ci skip]

CE upstream - 2018-04-16 18:02 UTC

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

Web IDE now in CE

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

Add note about HA configurations

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

Web IDE is now GA

Closes #45307

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

Add RBAC flag for Runner chart to docs

Closes #44853

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

Move ReadyToMerge vue component

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

Move ReadyToMerge vue component

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

`package-qa` was renamed to `package-and-qa`

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

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

# Conflicts:
#	app/assets/stylesheets/pages/milestone.scss
#	app/controllers/admin/application_settings_controller.rb
#	lib/gitlab.rb
#	spec/features/admin/admin_settings_spec.rb
#	spec/lib/gitlab_spec.rb

[ci skip]

Adds helpers to remove withespace and linebreaks

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

[ci skip]

Resolve "Bad SQL in the migration of job artifact registries to a separate table"

Closes #5646 and #5639

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

Update permissions.md with guidance for developing new features

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

Fix container scanning in vendored GitLab CI configuration for Auto Devops

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

Resolve "Geo: GPRD status is now timing out"

Closes #5350

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

Update faraday_middleware to 0.12.2

Closes #45397

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

Double-checked internal ID generation for transition phase

Closes #45269

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

corrected git cheat sheet url

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

Bump parser gem to 2.5.1.0 to remove warning in rspec

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

Use direct link rather than redirect for the 2F2 documentation page

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

Geo: Improve SSH key replication step documentation

Closes #4885

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

Added missing actions in todos docs

Closes #44803

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

Add note about support of variables policy to docs

Closes #45301

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

CE upstream - 2018-04-14 00:26 UTC

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

Add Elasticsearch developer documentation

Closes #5032

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

Include git SHA with GitLab version on Admin Dashboard

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

This is useful for a transition period to migrate away from
`NoninternalAtomicId`. In a situation where both the old and new code to
generate a iid value is run at the same time (for example, during a
deploy different nodes may serve both versions), this will lead to
problems regarding the correct `last_value`. That is, what we track in
`InternalId` may get out of sync with the maximum iid present for
issues.

With this change, we double-check that and correct the `last_value` with
the maximum iid found in issues if necessary.

This is subject to be removed with the 10.8 release and tracked over
here: https://gitlab.com/gitlab-org/gitlab-ce/issues/45389

Closes #45269.

Validate project path prior to hitting the database.

Closes #45247

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