diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-12-28 11:55:21 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-12-28 11:55:21 +0000 |
| commit | 202010e33fc546a8529b3a7a6f919a6814ccf6eb (patch) | |
| tree | 4cc942dd642760ec8802acc165bc325263153a44 /Gemfile.lock | |
| parent | 19054ba32bc22aec98cd1892bf6ce11fed5ae03f (diff) | |
| parent | 9e0f532f3eca474bbb4bdf49ea744afb23178b82 (diff) | |
| download | gitlab-ce-202010e33fc546a8529b3a7a6f919a6814ccf6eb.tar.gz | |
Merge branch 'add-recaptcha-support' into 'master'
Add support for Google reCAPTCHA in user registration to prevent spammers
To do:
- [x] Failing reCAPTCHA test causes all the fields to be lost
- ~~[ ] Improve styling of reCAPTCHA box~~ (not possible)
- ~~[ ] Put settings in `application_settings` (?)~~
Page when you fail CAPTCHA:
See merge request !2216
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 59051b9f36f..5e1529642e7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -568,6 +568,8 @@ GEM trollop rdoc (3.12.2) json (~> 1.4) + recaptcha (1.0.2) + json redcarpet (3.3.3) redis (3.2.2) redis-actionpack (4.0.1) @@ -930,6 +932,7 @@ DEPENDENCIES raphael-rails (~> 2.1.2) rblineprof rdoc (~> 3.6) + recaptcha redcarpet (~> 3.3.3) redis-namespace redis-rails (~> 4.0.0) |