Robert Speicher d75ec6cd46 Merge branch 'fix-missing-saml-error-handling' into 'master' ...

Add proper nil and error handling to SAML login process

While writing the feature that would allow certain Omniauth providers to be marked as external I noticed that there is a scenario where the `gl_user` method can return `nil` and if this is not properly checked, it will lead to exceptions that will cause 500 errors. It is quite easy to land in this scenario, so I added `nil` checks.

I also noticed that the `saml` method in the `omniauth_callbacks_controller.rb` file lacked a `rescue` for `Gitlab::OAuth::SignupDisabledError`, which can happen if the default configuration from `1_settings.rb` is applied. So I also added this check.

See merge request !3609

2016-04-12 15:46:39 +00:00

..

assets

hide help block when user is creating a new project inside a group

2016-04-12 14:41:34 +01:00

controllers

Merge branch 'fix-missing-saml-error-handling' into 'master'

2016-04-12 15:46:39 +00:00

finders

Standardised the output of the JSON to always include the name

2016-03-29 11:59:13 +01:00

helpers

hide help block when user is creating a new project inside a group

2016-04-12 14:41:34 +01:00

mailers

Improve and finish the fallback to the In-Reply-To and References header for the reply-by-email feature

2016-03-25 13:05:15 +01:00

models

Dont return null

2016-04-11 18:14:01 +02:00

services

Delete notes via API

2016-04-12 14:24:05 +02:00

uploaders

Remove reduntant move_to_store override

2016-03-30 12:50:19 +02:00

validators

Allow webhooks URL to have leading and trailing spaces

2016-02-26 14:34:06 -05:00

views

hide help block when user is creating a new project inside a group

2016-04-12 14:41:34 +01:00

workers

Exclude projects pending deletion from all results

2016-03-31 20:20:18 +02:00