summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dzaporozhets@gitlab.com>2015-01-23 02:57:09 +0000
committerDmitriy Zaporozhets <dzaporozhets@gitlab.com>2015-01-23 02:57:09 +0000
commitcefe81b1bbb1d257c3de35afe0de896f9f6b751c (patch)
tree4c59f0a3151007b15433cfe94027ad9d75246d40
parent497f7be564fbe4bc0b820435edea10d9d3d72528 (diff)
parente36334c77071b565f6d533bc1dcb2ecf78e6b7cc (diff)
downloadgitlab-ce-cefe81b1bbb1d257c3de35afe0de896f9f6b751c.tar.gz
Merge branch 'allow_user_http_in_ouath' into 'master'
Allow user to use http in ouath See merge request !1426
-rw-r--r--config/initializers/doorkeeper.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/config/initializers/doorkeeper.rb b/config/initializers/doorkeeper.rb
index 23d9852725b..4819ab273dc 100644
--- a/config/initializers/doorkeeper.rb
+++ b/config/initializers/doorkeeper.rb
@@ -36,6 +36,12 @@ Doorkeeper.configure do
# Issue access tokens with refresh token (disabled by default)
use_refresh_token
+ # Forces the usage of the HTTPS protocol in non-native redirect uris (enabled
+ # by default in non-development environments). OAuth2 delegates security in
+ # communication to the HTTPS protocol so it is wise to keep this enabled.
+ #
+ force_ssl_in_redirect_uri false
+
# Provide support for an owner to be assigned to each registered application (disabled by default)
# Optional parameter :confirmation => true (default false) if you want to enforce ownership of
# a registered application