diff options
| author | Jan Provaznik <jprovaznik@gitlab.com> | 2018-11-12 15:52:01 +0100 |
|---|---|---|
| committer | Jan Provaznik <jprovaznik@gitlab.com> | 2018-11-14 12:41:16 +0100 |
| commit | f6d368c74854be15b2783d8ff08e40f510e3d976 (patch) | |
| tree | 9e0ccafae545e0accb587ef571d82303a53f0184 | |
| parent | 648f05622dc0a71c6c2addfac4ce5f2a639d4468 (diff) | |
| download | gitlab-ce-switch-rails.tar.gz | |
Minor gem fixesswitch-rails
| -rw-r--r-- | Gemfile.lock | 2 | ||||
| -rw-r--r-- | Gemfile.rails4 | 2 | ||||
| -rw-r--r-- | Gemfile.rails4.lock | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 6e1a032be34..c255df8642f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -546,7 +546,7 @@ GEM orm_adapter (0.5.0) os (1.0.0) parallel (1.12.1) - parser (2.5.1.2) + parser (2.5.3.0) ast (~> 2.4.0) parslet (1.8.2) peek (1.0.1) diff --git a/Gemfile.rails4 b/Gemfile.rails4 index 6fae99aa893..0ec00e702aa 100644 --- a/Gemfile.rails4 +++ b/Gemfile.rails4 @@ -1,4 +1,4 @@ -# BUNDLE_GEMFILE=Gemfile.rails5 bundle install +# BUNDLE_GEMFILE=Gemfile.rails4 bundle install ENV["RAILS5"] = "false" diff --git a/Gemfile.rails4.lock b/Gemfile.rails4.lock index ff51d164a1d..23261373c2b 100644 --- a/Gemfile.rails4.lock +++ b/Gemfile.rails4.lock @@ -451,9 +451,9 @@ GEM memoizable (0.4.2) thread_safe (~> 0.3, >= 0.3.1) method_source (0.9.0) - mime-types (3.1) + mime-types (3.2.2) mime-types-data (~> 3.2015) - mime-types-data (3.2016.0521) + mime-types-data (3.2018.0812) mimemagic (0.3.0) mini_magick (4.8.0) mini_mime (1.0.1) @@ -598,7 +598,7 @@ GEM get_process_mem (~> 0.2) puma (>= 2.7, < 4) pyu-ruby-sasl (0.0.3.3) - rack (1.6.10) + rack (1.6.11) rack-accept (0.4.5) rack (>= 0.4) rack-attack (4.4.1) |