diff options
| author | Timothy Andrew <mail@timothyandrew.net> | 2017-07-03 19:37:37 +0000 |
|---|---|---|
| committer | Timothy Andrew <mail@timothyandrew.net> | 2017-07-06 06:30:07 +0000 |
| commit | 7c2f5bb48d98426b8458782216311f24aa705209 (patch) | |
| tree | 42ddeb5c86f5d4e99152b81fe5425e4629d0a8e9 /app/controllers/omniauth_callbacks_controller.rb | |
| parent | f1caa0b316c0be7c957e34a4bcc9f392023379d3 (diff) | |
| download | gitlab-ce-7c2f5bb48d98426b8458782216311f24aa705209.tar.gz | |
Fix build for !11963.
- Don't use `request.env['omniauth.params']` if it isn't present.
- Remove the `saml` section from the `gitlab.yml` test section. Some tests
depend on this section not being initially present, so it can be overridden
in the test. This MR doesn't add any tests for SAML, so we didn't really need
this in the first place anyway.
- Clean up the test -> omniauth section of `gitlab.yml`
Diffstat (limited to 'app/controllers/omniauth_callbacks_controller.rb')
| -rw-r--r-- | app/controllers/omniauth_callbacks_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/omniauth_callbacks_controller.rb b/app/controllers/omniauth_callbacks_controller.rb index c5adadfa529..323d5d26eb6 100644 --- a/app/controllers/omniauth_callbacks_controller.rb +++ b/app/controllers/omniauth_callbacks_controller.rb @@ -153,6 +153,6 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController def remember_me? request_params = request.env['omniauth.params'] - request_params['remember_me'] == '1' + (request_params['remember_me'] == '1') if request_params.present? end end |