diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-03-12 17:15:06 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-03-12 17:15:06 +0000 |
| commit | 04505c3399388c124fc4b1da9e8a5491f8d6a0ca (patch) | |
| tree | 1be8369cb469f227a4f226c908364bef7ba6e737 | |
| parent | ff292d40a23e3df9b08f7b4dc715f1e35bf34de1 (diff) | |
| parent | db8561859836b135ce07c8c563c66aa058a0f657 (diff) | |
| download | gitlab-ce-04505c3399388c124fc4b1da9e8a5491f8d6a0ca.tar.gz | |
Merge branch 'sh-bump-ruby-parser' into 'master'
Bump parser and unparser gems to remove warnings
See merge request gitlab-org/gitlab-ce!17673
| -rw-r--r-- | Gemfile.lock | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index fa99ec3febe..b85c7085d07 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -63,7 +63,7 @@ GEM fog-core mime-types (>= 2.99) unf - ast (2.3.0) + ast (2.4.0) atomic (1.1.99) attr_encrypted (3.0.3) encryptor (~> 3.0.0) @@ -586,8 +586,8 @@ GEM orm_adapter (0.5.0) os (0.9.6) parallel (1.12.1) - parser (2.4.0.2) - ast (~> 2.3) + parser (2.5.0.3) + ast (~> 2.4.0) parslet (1.5.0) blankslate (~> 2.0) path_expander (1.0.2) @@ -951,13 +951,13 @@ GEM get_process_mem (~> 0) unicorn (>= 4, < 6) uniform_notifier (1.10.0) - unparser (0.2.6) + unparser (0.2.7) abstract_type (~> 0.0.7) adamantium (~> 0.2.0) concord (~> 0.1.5) diff-lcs (~> 1.3) equalizer (~> 0.0.9) - parser (>= 2.3.1.2, < 2.5) + parser (>= 2.3.1.2, < 2.6) procto (~> 0.0.2) url_safe_base64 (0.2.2) validates_hostname (1.0.6) |