Rémy Coutable bd71438d6a Merge branch 'bring-back-newrelic-gem' into 'master' ...

Revert "Remove newrelic gem. Closes #12860"

This reverts commit 531767175f.

Conflicts:
	Gemfile.lock

See merge request !2943

2016-02-24 07:25:36 +00:00

..

environments

Raise an error on page load if there are pending migrations on dev env

2016-01-19 00:12:30 -02:00

initializers

Properly set auto_link_saml_user default value in the Settings loader.

2016-02-22 11:59:15 -05:00

locales

Implement new UI for pagination

2016-01-20 21:27:01 -05:00

application.rb

Merge branch 'rs-emoji' into 'master'

2016-02-19 08:11:02 +00: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.env

Improving the "Environment variables" administration doc

2016-02-01 19:10:46 +01: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

Document true/false as supported value.

2016-02-19 07:43:00 +00:00

mail_room.yml

Make Reply by email easier to configure

2015-10-13 13:10:49 +02:00

newrelic.yml

Revert "Remove newrelic gem. Closes #12860"

2016-02-23 07:25:37 -08: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 'issue_13301_emoji-menu' into 'master'

2016-02-24 02:50:45 +00:00

secrets.yml.example

Groundwork for merging CI into CE

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

sidekiq.yml.example

bug found by Charles Sibbald at Sky . Calls with patricio and Jacob confirmed this

2016-02-18 18:58:51 +00:00

unicorn.rb.example

Fix typos and grammar

2016-02-10 12:43:19 +02:00

unicorn.rb.example.development

Increase unicorn timeout to 60 seconds

2014-09-23 17:11:16 +03:00