Robert Speicher c52fe24c36 Merge branch 'reply-by-email-improvements' into 'master' ... Ignore empty incoming messages (Reply by email) We should also update mail_room when https://github.com/tpitale/mail_room/pull/35 goes in, but that can wait a bit. See merge request !1190		2015-08-24 21:56:07 +00:00
..
environments	Merge pull request #8349 from divineforest/cleanup-assets-compress	2015-03-02 15:23:57 -08:00
initializers	Only include base URL in OmniAuth full_host parameter	2015-08-23 13:31:02 -07:00
locales	Improve OAuth application flash messages.	2015-05-13 09:41:56 +02: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	Add documentation.	2015-08-19 13:58:14 -07: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	Revert "Merge branch 'revert-satellites' into 'master' "	2015-08-11 14:33:31 +02: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