diff options
| author | Paweł Chojnacki <pawel@chojnacki.ws> | 2017-07-04 15:58:20 +0000 |
|---|---|---|
| committer | Paweł Chojnacki <pawel@chojnacki.ws> | 2017-07-04 15:58:20 +0000 |
| commit | 7ac065d0f5fef25a1b8a1b2be76567ddad0e29fd (patch) | |
| tree | cd34b593017512d296736a6e6a39c996d86371a5 /Gemfile.lock | |
| parent | b5f3903b81856c2b9bcfadaed9e1bb9cf9938710 (diff) | |
| parent | d453bb863593f7d5daab2a3e88ff1f18139d7eb1 (diff) | |
| download | gitlab-ce-7ac065d0f5fef25a1b8a1b2be76567ddad0e29fd.tar.gz | |
Merge branch 'master' into 'bump-prometheus-version-to-fix-text-representation-problem'bump-prometheus-version-to-fix-text-representation-problem
# Conflicts:
# Gemfile.lock
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index c62b253546d..430e1ba257b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -658,7 +658,7 @@ GEM thor (>= 0.18.1, < 2.0) rainbow (2.2.2) rake - raindrops (0.17.0) + raindrops (0.18.0) rake (10.5.0) rblineprof (0.3.6) debugger-ruby_core_source (~> 1.3) @@ -1062,6 +1062,7 @@ DEPENDENCIES rails-deprecated_sanitizer (~> 1.0.3) rails-i18n (~> 4.0.9) rainbow (~> 2.2) + raindrops (~> 0.18) rblineprof (~> 0.3.6) rdoc (~> 4.2) recaptcha (~> 3.0) |