# 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

* similar to rails 5 it assures that index length is set for blob
  columns also in rails 4
* it also ignores multiple definitions of indexes for mysql, for some
  tables we define multiple indexes on the same set of columns, but with
  different parameters (opclasses, where), these are not supported by
  mysql adapter so the second definition of index is skipped

CI jobs will be triggered both with rails 4 and 5
to make sure we keep backward compatibility if it turns out
we have to switch back to rails 4.

Rails 4 jobs are not allowed to fail for now, these jobs will be
removed in a follow-up MR next cycle.

* updates Gemfile
* uses Rails 5 unless explicitly disable

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

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

Move cloud-native-image to the post-test stage

Closes charts/gitlab#897

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

Bump GitLab Workhorse to 7.1.1

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

Bump `binding_of_caller` gem version to 0.8.0

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

removed gcp_clusters table and keys

Merge branch '54002-activity-feed-missing-padding-in-event-note-when-a-branch-is-deleted' into 'master'

Resolve "Activity Feed - Missing padding in event note when a branch is deleted"

Closes #54002

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

This version now supports redis[s]:// URL schemes.

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 bigint

* similar to rails 5 it assures that index length is set for blob
  columns also in rails 4
* it also ignores multiple definitions of indexes for mysql, for some
  tables we define multiple indexes on the same set of columns, but with
  different parameters (opclasses, where), these are not supported by
  mysql adapter so the second definition of index is skipped

CI jobs will be triggered both with rails 4 and 5
to make sure we keep backward compatibility if it turns out
we have to switch back to rails 4.

Rails 4 jobs are not allowed to fail for now, these jobs will be
removed in a follow-up MR next cycle.