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
..
api	Fix builds API response not including commit data	2016-06-21 14:26:57 +02:00
assets
backup	Only create the backup directory if it is local	2016-06-10 10:17:54 -07:00
banzai	Merge branch 'fix-external-issue-links' into 'master'	2016-06-22 21:40:17 +00:00
ci	Merge remote-tracking branch 'upstream/master' into feature/runner-lock-on-project	2016-06-20 14:04:14 +00:00
container_registry	Show proper image ID on registry page	2016-06-21 13:08:10 +02:00
gitlab	Merge branch 'fix_saml_signin' into 'master'	2016-06-22 22:12:09 +00:00
json_web_token	Revert "Fix merge conflicts - squashed commit"	2016-06-03 11:10:17 +02:00
omni_auth
rouge/formatters
support	Revert "Fix merge conflicts - squashed commit"	2016-06-03 11:10:17 +02:00
tasks	added nice to have - rake task and some changes to docs	2016-06-21 19:23:21 +02:00
banzai.rb	Move pre_process into render_result	2016-06-21 17:39:01 +02:00
disable_email_interceptor.rb
event_filter.rb	Revert "Fix merge conflicts - squashed commit"	2016-06-03 11:10:17 +02:00
extracts_path.rb
file_size_validator.rb	Get rid of more requires, which causes warnings when code is reloaded	2016-04-19 11:48:10 +02:00
file_streamer.rb
gitlab.rb	Revert "Fix merge conflicts - squashed commit"	2016-06-03 11:10:17 +02:00
gt_one_coercion.rb
repository_cache.rb
static_model.rb
unfold_form.rb
uploaded_file.rb
version_check.rb