diff options
| author | Valery Sizov <valery@gitlab.com> | 2015-09-01 10:38:46 +0000 |
|---|---|---|
| committer | Valery Sizov <valery@gitlab.com> | 2015-09-01 10:38:46 +0000 |
| commit | 96b55a0e90464b5920a91da10357f561b64c7b4b (patch) | |
| tree | 101a5794fe0d9bf0d01c53d32174115e08e1a72c /Gemfile.lock | |
| parent | bb86df1bd2f5c56a5e0f2087b3bd0daf7391db05 (diff) | |
| parent | 1eba96c636fc441c7fafbffe0a3cdf195a1595f9 (diff) | |
| download | gitlab-ce-96b55a0e90464b5920a91da10357f561b64c7b4b.tar.gz | |
Merge branch 'master' into 'master'
Update Racc to 1.4.12
The primary reason for this is that this would let me debug #2343 using Rubinius' `-Xic.debug` option.
See merge request !1201
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index ff01ad10145..1772500d659 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -462,7 +462,7 @@ GEM pyu-ruby-sasl (0.0.3.3) quiet_assets (1.0.2) railties (>= 3.1, < 5.0) - racc (1.4.10) + racc (1.4.12) rack (1.5.5) rack-accept (0.4.5) rack (>= 0.4) |