Douwe Maan eab086bde1 Merge branch 'master' into merge-if-green ...

# Conflicts:
#	app/controllers/projects/merge_requests_controller.rb
#	config/routes.rb

2015-12-09 09:00:25 +01:00

..

environments

Rails deprecation warning about log_level

2015-12-03 10:53:58 +02:00

initializers

Fix signin with OmniAuth providers

2015-12-08 14:58:15 +01:00

locales

Added total query time to Sherlock

2015-11-24 10:57:21 +01:00

application.rb

Migrate mailers to ActiveJob

2015-11-26 17:03:43 +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

Rails update to 4.2.4

2015-11-25 18:18:44 +02: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

Update documentation about automatic issue closing

2015-12-07 14:11:13 +01:00

mail_room.yml

Make Reply by email easier to configure

2015-10-13 13:10:49 +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 'master' into merge-if-green

2015-12-09 09:00:25 +01:00

schedule.rb

Groundwork for merging CI into CE

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

schedule.yml

Migrate from Sidetiq to Sidekiq-cron

2015-12-04 11:29:45 -02: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