gitlab-org--gitlab-foss/spec
Robert Speicher cef021917f Merge branch 'fix_saml_signin' into 'master'
Fix subsequent SAML sign ins

Fixes a bug when `auto_link_ldap_user` is `true` that causes SAML users to be unable to sign in a second time.

Fix the problem for https://gitlab.zendesk.com/agent/tickets/22546

See merge request !4718
2016-06-22 22:12:09 +00:00
..
config Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
controllers Merge branch '18755-fix-destroy-project-causes-post_decline_request-to-be-executed' into 'master' 2016-06-22 01:15:29 +00:00
factories Merge remote-tracking branch 'upstream/master' into feature/runner-lock-on-project 2016-06-20 14:04:14 +00:00
features Merge branch '18871-check-improve-how-we-display-access-requesters-in-admin-area' into 'master' 2016-06-22 01:17:08 +00:00
finders Revert "squashed merge and fixed conflicts" 2016-06-16 12:59:07 +02:00
fixtures Show proper image ID on registry page 2016-06-21 13:08:10 +02:00
helpers Correctly adds commit ID into dropdown 2016-06-18 21:49:20 +01:00
initializers Add tests for setting trusted_proxies 2016-05-04 15:49:39 -07:00
javascripts Added text_utility to JS tests 2016-06-20 08:54:57 +01:00
lib Merge branch 'fix_saml_signin' into 'master' 2016-06-22 22:12:09 +00:00
mailers Fallback to group's owners/masters when a project has none 2016-06-20 12:10:37 +02:00
models Merge branch '18755-fix-destroy-project-causes-post_decline_request-to-be-executed' into 'master' 2016-06-22 01:15:29 +00:00
requests Fix builds API response not including commit data 2016-06-21 14:26:57 +02:00
routing Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
services Raise a new Gitlab::Access::AccessDeniedError when permission is not enough to destroy a member 2016-06-18 06:06:34 +02:00
support Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export 2016-06-16 13:04:00 +02:00
tasks/gitlab Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
views
workers Unify check branch name exist 2016-06-20 21:44:21 +02:00
factories_spec.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
rails_helper.rb
spec_helper.rb Enable Knapsack only in CI environment 2016-06-08 11:43:13 +02:00
teaspoon_env.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00