CE upstream - 2018-11-14 19:21 UTC

Closes gitlab-org/quality/staging#16

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

Fix vertical line alignment in discussion & diff border-radius

Closes #53975

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

Add white background to commit diff comments

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

CE upstream - 2018-11-14 17:23 UTC

Closes gitlab-ce#53866

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

Fix Git protocol v2 e2e test

Closes gitlab-org/quality/staging#16

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

Update proofreader.md

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

Updates pipeline code to use gitlab-ui

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

CE upstream - 2018-11-14 14:21 UTC

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

Remove references to `Factory`

Fix collapsed files not fully fully expanding

Closes #53866

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

Disable updating appearance of filter tokens for special values

Closes #53636

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

Add a new markup languages section

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

Show navigation line separator when instance metrics is disabled

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

Show navigation line separator when instance metrics is disabled

Closes #8363

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

# Conflicts:
#	.gitlab-ci.yml
#	db/schema.rb
#	doc/development/README.md

[ci skip]

Add missing slash in frontend testing guide

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

Switch to Rails 5

Closes #14286 and #48991

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

[EE] Switch to Rails 5

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

CE upstream - 2018-11-14 13:21 UTC

Closes charts/gitlab#897

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

In Rails 5 all models by default inherit from ApplicationRecord.

We want to run CI with rails 4 for a short-term (until we are sure that
we will ship with rails 5). The problem is that rails 4 can not handle
rails 5 schema.rb properly - specifically `t.index` directive can not
handle multiple indexes on the same column.

Because combination of rails 4 + rails 5 schema will be used
only in CI for a short-term, we can just ignore these incompatibility
failures. This patch adds `rails5` helper for specs.

* add_index replaced with t.index
* intiger(size 8) replaced with bigin