Robert Speicher 09bcce7d1f Merge branch 'ldap-attributes' into 'master' ... Allow configuration of LDAP attributes GitLab will use for the new user account. Fixes #2412. See merge request !1261		2015-09-16 18:34:55 +00:00
..
environments	Groundwork for merging CI into CE	2015-08-25 18:42:46 -07:00
initializers	Merge branch 'ldap-attributes' into 'master'	2015-09-16 18:34:55 +00:00
locales	Groundwork for merging CI into CE	2015-08-25 18:42:46 -07:00
application.rb	Expire Rails cache entries after two weeks	2015-07-15 13:53:40 +02:00
aws.yml.example	Add a note that changing example configuration files requires changing omnibus-gitlab.	2015-06-11 15:11:37 +02:00
boot.rb
database.yml.mysql	set the collation to utf8_general_ci	2014-08-13 14:45:23 +01:00
database.yml.postgresql	Remove 'socket' example PostgreSQL parameter	2014-07-01 18:27:50 +02:00
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	Merge branch 'ldap-attributes' into 'master'	2015-09-16 18:34:55 +00:00
mail_room.yml.example	Ignore empty incoming messages.	2015-08-24 10:57:35 -07:00
newrelic.yml	Add dormant New Relic gem	2014-09-16 17:31:20 +02:00
resque.yml.example	Add a note that changing example configuration files requires changing omnibus-gitlab.	2015-06-11 15:11:37 +02:00
routes.rb	Merge remote-tracking branch 'origin/master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g	2015-09-15 22:40:35 +02:00
schedule.rb	Groundwork for merging CI into CE	2015-08-25 18:42:46 -07:00
secrets.yml.example	Groundwork for merging CI into CE	2015-08-25 18:42:46 -07:00
sidekiq.yml.example	Groundwork for merging CI into CE	2015-08-25 18:42:46 -07:00
unicorn.rb.example	Add a note that changing example configuration files requires changing omnibus-gitlab.	2015-06-11 15:11:37 +02:00
unicorn.rb.example.development	Increase unicorn timeout to 60 seconds	2014-09-23 17:11:16 +03:00