diff options
| author | Jan Provaznik <jprovaznik@gitlab.com> | 2018-11-12 15:52:01 +0100 |
|---|---|---|
| committer | Jan Provaznik <jprovaznik@gitlab.com> | 2018-11-12 16:07:17 +0100 |
| commit | de0bbe13e31e63e94cab86882524b5d06bcdcbc2 (patch) | |
| tree | 4f59acaf5b4188b7216a20a5a4c73cc918da971f | |
| parent | 993dd964becd4ab08d83a07c6ecb2dbf57020f95 (diff) | |
| download | gitlab-ce-de0bbe13e31e63e94cab86882524b5d06bcdcbc2.tar.gz | |
Minor gem fixes
| -rw-r--r-- | Gemfile.lock | 2 | ||||
| -rw-r--r-- | Gemfile.rails4 | 2 | ||||
| -rw-r--r-- | Gemfile.rails4.lock | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 31f06121884..247ce6c254e 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 18e162e9f6c..8570fabb72f 100644 --- a/Gemfile.rails4.lock +++ b/Gemfile.rails4.lock @@ -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) |