Douwe Maan 3f59a8f0be Merge branch 'cernvcs/gitlab-ce-feature/auto_link_ldap_omniauth'		2015-06-05 13:34:25 +02:00
..
environments	Merge pull request #8349 from divineforest/cleanup-assets-compress	2015-03-02 15:23:57 -08:00
initializers	Add option to automatically link omniauth and LDAP identities	2015-06-03 11:46:20 +02:00
locales	Improve OAuth application flash messages.	2015-05-13 09:41:56 +02:00
application.rb	Add otp_attempt to filtered parameters	2015-05-09 17:32:49 -04:00
aws.yml.example
boot.rb
database.yml.mysql
database.yml.postgresql
environment.rb
gitlab.teatro.yml	Revert "Allow to configure smtp and sendmail in gitlab.yml"	2015-05-06 17:39:18 +03:00
gitlab.yml.example	Add option to automatically link omniauth and LDAP identities	2015-06-03 11:46:20 +02:00
newrelic.yml
resque.yml.example
routes.rb	Remove show actions from Admin and Project DeployKeys	2015-06-03 18:03:04 -04:00
unicorn.rb.example	Revert "Increase timeout for Git-over-HTTP requests."	2015-03-19 18:29:20 -07:00
unicorn.rb.example.development