Robert Speicher c670f07366 Merge branch 'clarify-postfix' into 'master' ...

Clarify Reply by email settings when using Postfix mail server

Fixes #2902.

[ci skip]

See merge request !1528

2015-10-07 19:59:57 +00:00

..

environments

Groundwork for merging CI into CE

2015-08-25 18:42:46 -07:00

initializers

Remove the option to disable CI

2015-10-05 12:23:38 -04:00

locales

Add recently_reset message to Devise translations

2015-10-01 21:46:51 -04: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

init commit

2011-10-09 00:36:38 +03:00

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

Use similar interface to access gitolite

2012-08-29 00:04:06 +03:00

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 'ee_features_in_example_config' into 'master'

2015-10-01 15:12:24 +00:00

mail_room.yml.example

Clarify Reply by email settings when using Postfix mail server

2015-10-07 11:43:38 +02: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 branch 'cleanup-ci-pages' into 'master'

2015-10-07 17:04:54 +00: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