Grzegorz Bizon 0b8a2779e7 Merge branch 'master' into fix/gb/encrypt-runners-tokens ... * master: (243 commits) Conflicts: db/schema.rb lib/gitlab/import_export/import_export.yml		2018-11-28 13:14:04 +01:00
..
fixtures	CE backport - Chart showing issues created per month	2018-11-07 17:22:15 +00:00
importers	Use Rails.root for CommonMetricsImporter	2018-09-11 17:40:32 +02:00
migrate	Merge branch 'master' into fix/gb/encrypt-runners-tokens	2018-11-28 13:14:04 +01:00
optional_migrations	Add version 4.2 to all existing migrations	2018-11-22 13:18:28 +01:00
post_migrate	Merge branch 'master' into fix/gb/encrypt-runners-tokens	2018-11-28 13:14:04 +01:00
schema.rb	Merge branch 'master' into fix/gb/encrypt-runners-tokens	2018-11-28 13:14:04 +01:00
seeds.rb