2 commits

Author	SHA1	Message	Date
Robert Speicher	4493ec0880	Merge branch 'jej/fix-disabled-oauth-access-10-3' into 'security-10-3' ... [10.3] Prevent login with disabled OAuth providers See merge request gitlab/gitlabhq!2296 (cherry picked from commit 4936650427ffc88e6ee927aedbb2c724d24b094c) a0f9d222 Prevents login with disabled OAuth providers	2018-01-16 17:05:01 -08:00
Jacopo	0b5133bac2	Extract "@request.env['devise.mapping'] = Devise.mappings[:user]" to a test helper ... Extracted `@request.env['devise.mapping'] = Devise.mappings[:user]` and `Rails.application.env_config['devise.mapping'] = Devise.mappings[:user]` in our tests into the helper method `set_devise_mapping`	2017-07-20 18:36:53 +02:00