summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Gemfile4
-rw-r--r--Gemfile.lock6
-rw-r--r--config/newrelic.yml31
3 files changed, 2 insertions, 39 deletions
diff --git a/Gemfile b/Gemfile
index 827bc765..905252d2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -73,12 +73,10 @@ group :development, :test do
gem 'rspec-rails'
gem 'simplecov', require: false
gem 'spring'
- gem 'sqlite3'
- gem 'teaspoon-jasmine'
+ gem 'teaspoon-jasmine', '~> 2.3.4'
end
group :production do
- gem 'newrelic_rpm'
gem 'dalli'
gem 'unicorn'
gem 'dotenv-deployment'
diff --git a/Gemfile.lock b/Gemfile.lock
index 7467736d..00ca66a3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -385,7 +385,6 @@ GEM
net-scp (1.2.1)
net-ssh (>= 2.6.5)
net-ssh (4.1.0)
- newrelic_rpm (4.1.0.333)
nokogiri (1.7.1)
mini_portile2 (~> 2.1.0)
parser (2.4.0.0)
@@ -493,7 +492,6 @@ GEM
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
- sqlite3 (1.3.13)
sshkit (1.13.1)
net-scp (>= 1.1.2)
net-ssh (>= 2.8.0)
@@ -596,7 +594,6 @@ DEPENDENCIES
lol_dba
mime-types
mini_magick
- newrelic_rpm
pg
phantomjs
poltergeist
@@ -612,8 +609,7 @@ DEPENDENCIES
spank
spring
spring-commands-rspec
- sqlite3
- teaspoon-jasmine
+ teaspoon-jasmine (~> 2.3.4)
turbolinks
twitter
uglifier (>= 1.3.0)
diff --git a/config/newrelic.yml b/config/newrelic.yml
deleted file mode 100644
index 0a9ac900..00000000
--- a/config/newrelic.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-common: &default_settings
- license_key: '<%= ENV['NEWRELIC_KEY'] %>'
- monitor_mode: true
- developer_mode: false
- log_level: debug
- ssl: true
- verify_certificate: true
- apdex_t: 0.5
- capture_params: false
- transaction_tracer:
- enabled: true
- transaction_threshold: apdex_f
- record_sql: obfuscated
- stack_trace_threshold: 0.500
- error_collector:
- enabled: true
- capture_source: true
- ignore_errors: ActionController::RoutingError
-
-development:
- <<: *default_settings
- monitor_mode: false
- developer_mode: true
-
-test:
- <<: *default_settings
- monitor_mode: false
-
-production:
- <<: *default_settings
- monitor_mode: true