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

..

api

Merge branch 'api-delete-note' into 'master'

2016-04-12 14:34:50 +00:00

assets

move assets from lib directory to vendor

2012-05-29 17:56:48 +05:00

backup

Make sure there is a connection before using ActiveRecord

2016-02-08 17:31:24 +01:00

banzai

Instrument Banzai code

2016-04-11 17:43:12 +02:00

ci

Fix build dependencies, when the dependency is a string

2016-03-23 12:55:23 +01:00

gitlab

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

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

omni_auth

Fix signin with OmniAuth providers

2015-12-08 14:58:15 +01:00

rouge/formatters

Remove custom Lexer. #3945 [ci skip]

2016-01-08 15:20:48 -05:00

support

Do not serve anything via nginx as we have workhorse

2016-03-11 15:04:04 +01:00

tasks

Put CACHE_NAMESPACE in the Gitlab::Redis module

2016-04-07 15:42:07 +02:00

award_emoji.rb

Pre-calculate Emoji digests

2016-03-30 19:29:17 +02:00

banzai.rb

Add a PreProcessPipeline

2016-03-02 22:19:36 -05:00

disable_email_interceptor.rb

Add email interceptor to prevent mail sending if email sending is disabled.

2014-10-27 13:05:50 +01:00

event_filter.rb

Fix rubocop warnings in lib

2015-10-03 01:29:58 -05:00

extracts_path.rb

Only render 404 page from /public

2015-10-13 20:12:34 +03:00

file_size_validator.rb

Support configurable attachment size via Application Settings

2015-04-02 00:04:08 -07:00

file_streamer.rb

Implement Build Artifacts

2015-11-10 12:51:50 +01:00

gitlab.rb

Revert "Merge branch 'revert-satellites' into 'master' "

2015-08-11 14:33:31 +02:00

gt_one_coercion.rb

diff unfold

2014-08-14 15:48:14 +04:00

repository_cache.rb

Store commit count in project table

2015-07-17 15:22:56 +02:00

static_model.rb

Fixed styles, ProjectHook specs etc

2013-01-05 00:35:38 +02:00

unfold_form.rb

Gitlab Issue 707: Indent unfolded code 1 character

2015-07-22 09:58:17 -04:00

uploaded_file.rb

Implement Build Artifacts

2015-11-10 12:51:50 +01:00

version_check.rb

Update version check images to use SVG

2016-01-05 14:35:29 -05:00