diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-28 21:06:11 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-28 21:06:11 +0300 |
| commit | 4f05a630951858cc2b7dafada27f3dcf87ba29bd (patch) | |
| tree | 1b87468300c53594465ca10f89e082651a08707c /Gemfile.lock | |
| parent | 7cdd70dcec27402e89e65451b4b1feb75b5eb267 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 2610ac83b1d..054a491a019 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -143,8 +143,7 @@ GEM cause (0.1) character_set (1.1.2) charlock_holmes (0.7.6) - childprocess (0.9.0) - ffi (~> 1.0, >= 1.0.11) + childprocess (3.0.0) chunky_png (1.3.5) citrus (3.0.2) claide (1.0.3) @@ -286,7 +285,7 @@ GEM fast_blank (1.0.0) fast_gettext (1.6.0) ffaker (2.10.0) - ffi (1.11.1) + ffi (1.11.3) flipper (0.17.1) flipper-active_record (0.17.1) activerecord (>= 4.2, < 7) @@ -957,9 +956,9 @@ GEM seed-fu (2.3.7) activerecord (>= 3.1) activesupport (>= 3.1) - selenium-webdriver (3.141.0) - childprocess (~> 0.5) - rubyzip (~> 1.2, >= 1.2.2) + selenium-webdriver (3.142.6) + childprocess (>= 0.5, < 4.0) + rubyzip (>= 1.2.2) sentry-raven (2.9.0) faraday (>= 0.7.6, < 1.0) settingslogic (2.0.9) @@ -1326,7 +1325,7 @@ DEPENDENCIES sassc-rails (~> 2.1.0) scss_lint (~> 0.56.0) seed-fu (~> 2.3.7) - selenium-webdriver (~> 3.141) + selenium-webdriver (~> 3.142) sentry-raven (~> 2.9) settingslogic (~> 2.0.9) shoulda-matchers (~> 4.0.1) |