diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-06-07 21:38:04 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-06-07 21:38:04 +0000 |
| commit | 703026c03e3967831cb61f09fa983fca3e0b1d1b (patch) | |
| tree | e9a8b9de182c81f74be880a20d74d59a24dab14d /Gemfile.lock | |
| parent | fd248392dddcb484fbe21e3cee9d7a64f1e96960 (diff) | |
| parent | 405d752b9b68d0c0c01cc4aae76d6f5acd21dc27 (diff) | |
| download | gitlab-ce-703026c03e3967831cb61f09fa983fca3e0b1d1b.tar.gz | |
Merge branch 'bump-recaptcha-gem' into 'master'
Bump recaptcha gem to 3.0.0 to remove deprecated stoken support
Google deprecated the use of stoken in its reCAPTCHA, so this gem is
necessary to make things work again.
Closes #18210
See merge request !4484
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 489c7e7b44d..28de59beec7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -551,7 +551,7 @@ GEM debugger-ruby_core_source (~> 1.3) rdoc (3.12.2) json (~> 1.4) - recaptcha (1.0.2) + recaptcha (3.0.0) json redcarpet (3.3.3) redis (3.3.0) @@ -934,7 +934,7 @@ DEPENDENCIES raphael-rails (~> 2.1.2) rblineprof rdoc (~> 3.6) - recaptcha + recaptcha (~> 3.0) redcarpet (~> 3.3.3) redis (~> 3.2) redis-namespace |