diff options
| author | Hiroyuki Sato <sathiroyuki@gmail.com> | 2018-11-21 11:58:52 +0900 |
|---|---|---|
| committer | Hiroyuki Sato <sathiroyuki@gmail.com> | 2018-11-21 11:58:52 +0900 |
| commit | 692f87215df9c2a96c889a00fbb7cf8d459c3595 (patch) | |
| tree | 642e6a6dbc74b58cea5ffa8abddf6ee0ee422470 /Gemfile.rails5 | |
| parent | b689b20f20f1a3773ba88cfb2f4d355d90389145 (diff) | |
| parent | 6a31259ccef5106126421ab5a93fd303a9326e4a (diff) | |
| download | gitlab-ce-692f87215df9c2a96c889a00fbb7cf8d459c3595.tar.gz | |
Merge remote-tracking branch 'origin/master' into fix-typos-occured
Conflicts:
- app/assets/javascripts/ide/stores/modules/pipelines/actions.js
- spec/javascripts/ide/stores/modules/pipelines/actions_spec.js
Diffstat (limited to 'Gemfile.rails5')
| -rw-r--r-- | Gemfile.rails5 | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/Gemfile.rails5 b/Gemfile.rails5 deleted file mode 100644 index 2b526b19ba0..00000000000 --- a/Gemfile.rails5 +++ /dev/null @@ -1,7 +0,0 @@ -# BUNDLE_GEMFILE=Gemfile.rails5 bundle install - -ENV["RAILS5"] = "true" - -gemfile = File.expand_path("../Gemfile", __FILE__) - -eval(File.read(gemfile), nil, gemfile) |