Commit graph

4 commits

Author SHA1 Message Date
Rémy Coutable
b27db6cf0a
Use the new parallel keyword in .gitlab-ci.yml
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-11-15 14:34:41 +01:00
Sean McGivern
af3a73ef9c Merge branch 'switch-rails' into 'master'
Switch to Rails 5

Closes #14286 and #48991

See merge request gitlab-org/gitlab-ce!21492
2018-11-14 14:01:14 +00:00
Jan Provaznik
f6d368c748 Minor gem fixes 2018-11-14 12:41:16 +01:00
Jan Provaznik
547dc7ac60 Switch to Rails 5 by default
* updates Gemfile
* uses Rails 5 unless explicitly disabled
2018-11-14 12:38:30 +01:00
Renamed from Gemfile.rails5.lock (Browse further)