Merge branch 'master' of github.com:domify/registry

This commit is contained in:
Martin Lensment 2015-05-27 11:48:02 +03:00
commit 97b3e663cd
2 changed files with 4 additions and 2 deletions

View file

@ -1 +1,3 @@
NewRelic::Agent.config[:app_name] = "#{ENV['new_relic_app_name']} - #{Rails.env}" if ENV['new_relic_app_name'].present? unless Rails.env.test?
NewRelic::Agent.config[:app_name] = "#{ENV['new_relic_app_name']} - #{Rails.env}" if ENV['new_relic_app_name'].present?
end

View file

@ -11,7 +11,7 @@
# #
# It's strongly recommended that you check this file into your version control system. # It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema.define(version: 20150521120145) do ActiveRecord::Schema.define(version: 20150525075550) do
# These are extensions that must be enabled in order to support this database # These are extensions that must be enabled in order to support this database
enable_extension "plpgsql" enable_extension "plpgsql"