summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorGabriel Mazetto <gabriel@gitlab.com>2015-12-28 18:21:34 -0200
committerGabriel Mazetto <gabriel@gitlab.com>2015-12-28 18:50:29 -0200
commita3469d914aaf28a1184247cbe72e5197ce7ca006 (patch)
tree8bc68cf4adf391142bcfa8bf2cc7a3d7a572ead2 /doc
parentaf00558d38806eda2fa70c8fdc34be98fced44a4 (diff)
downloadgitlab-ce-a3469d914aaf28a1184247cbe72e5197ce7ca006.tar.gz
reCAPTCHA is configurable through Admin Settings, no reload needed.
Diffstat (limited to 'doc')
-rw-r--r--doc/integration/recaptcha.md47
1 files changed, 7 insertions, 40 deletions
diff --git a/doc/integration/recaptcha.md b/doc/integration/recaptcha.md
index 7e6f7e7e30a..a301d1a613c 100644
--- a/doc/integration/recaptcha.md
+++ b/doc/integration/recaptcha.md
@@ -6,51 +6,18 @@ to confirm that a real user, not a bot, is attempting to create an account.
## Configuration
-To use reCAPTCHA, first you must create a public and private key.
+To use reCAPTCHA, first you must create a site and private key.
1. Go to the URL: https://www.google.com/recaptcha/admin
-1. Fill out the form necessary to obtain reCAPTCHA keys.
+2. Fill out the form necessary to obtain reCAPTCHA keys.
-1. On your GitLab server, open the configuration file.
+3. Login to your GitLab server, with administrator credentials.
- For omnibus package:
+4. Go to Applications Settings on Admin Area (`admin/application_settings`)
- ```sh
- sudo editor /etc/gitlab/gitlab.rb
- ```
+5. Fill all recaptcha fields with keys from previous steps
- For installations from source:
+6. Check the `Enable reCAPTCHA` checkbox
- ```sh
- cd /home/git/gitlab
-
- sudo -u git -H editor config/gitlab.yml
- ```
-
-1. Enable reCAPTCHA and add the settings:
-
- For omnibus package:
-
- ```ruby
- gitlab_rails['recaptcha_enabled'] = true
- gitlab_rails['recaptcha_public_key'] = 'YOUR_PUBLIC_KEY'
- gitlab_rails['recaptcha_private_key'] = 'YOUR_PUBLIC_KEY'
- ```
-
- For installation from source:
-
- ```
- recaptcha:
- enabled: true
- public_key: 'YOUR_PUBLIC_KEY'
- private_key: 'YOUR_PRIVATE_KEY'
- ```
-
-1. Change 'YOUR_PUBLIC_KEY' to the public key from step 2.
-
-1. Change 'YOUR_PRIVATE_KEY' to the private key from step 2.
-
-1. Save the configuration file.
-
-1. Restart GitLab.
+7. Save the configuration.