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
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
boot.rb
database.yml.env	Improving the "Environment variables" administration doc	2016-02-01 19:10:46 +01:00
database.yml.mysql
database.yml.postgresql
environment.rb
gitlab.teatro.yml
gitlab.yml.example	Document true/false as supported value.	2016-02-19 07:43:00 +00:00
mail_room.yml
newrelic.yml	Revert "Remove newrelic gem. Closes #12860"	2016-02-23 07:25:37 -08:00
resque.yml.example
routes.rb	Merge branch 'issue_13301_emoji-menu' into 'master'	2016-02-24 02:50:45 +00:00
secrets.yml.example
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