diff options
author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2018-11-21 10:52:20 +0100 |
---|---|---|
committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2018-11-21 11:02:31 +0100 |
commit | 88e2b6ea9f48e8b4626cc49c33e9ac08e3a6ba3e (patch) | |
tree | 459db8f43843353795da8cb29ed3426b48ee7f1d /db/migrate/20171013094327_create_new_clusters_architectures.rb | |
parent | e491df5fc67a51d78e8d832a4919aff0033dc0bd (diff) | |
parent | 8edce61654463e20c7265d41263fcf8dd62abfae (diff) | |
download | gitlab-ce-88e2b6ea9f48e8b4626cc49c33e9ac08e3a6ba3e.tar.gz |
Merge remote-tracking branch 'dev/master' into security-encrypt-runners-tokens
* dev/master: (302 commits)
Conflicts:
db/schema.rb
lib/gitlab/import_export/import_export.yml
Diffstat (limited to 'db/migrate/20171013094327_create_new_clusters_architectures.rb')
0 files changed, 0 insertions, 0 deletions