diff --git a/Gemfile b/Gemfile index 4ad14411..a849ea4c 100644 --- a/Gemfile +++ b/Gemfile @@ -17,13 +17,13 @@ gem 'rails', '5.0.2' gem 'recaptcha', require: 'recaptcha/rails' gem 'rollbar' gem 'sass-rails' +gem 'skylight' gem 'therubyracer', platforms: :ruby gem 'uglifier' group :production do gem 'dalli' gem 'memcachier' - gem 'newrelic_rpm' gem 'pg' end diff --git a/Gemfile.lock b/Gemfile.lock index fa9d4479..f7f949a0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -54,7 +54,7 @@ GEM binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) builder (3.2.3) - capybara (2.12.1) + capybara (2.13.0) addressable mime-types (>= 1.16) nokogiri (>= 1.3.3) @@ -75,7 +75,7 @@ GEM debug_inspector (0.0.2) declarative (0.0.9) declarative-option (0.1.0) - devise (4.2.0) + devise (4.2.1) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0, < 5.1) @@ -90,7 +90,7 @@ GEM multipart-post (>= 1.2, < 3) globalid (0.3.7) activesupport (>= 4.1.0) - google-api-client (0.10.0) + google-api-client (0.10.1) addressable (~> 2.3) googleauth (~> 0.5) httpclient (~> 2.7) @@ -141,9 +141,9 @@ GEM activerecord kaminari-core (= 1.0.1) kaminari-core (1.0.1) - libv8 (3.16.14.17) + libv8 (3.16.14.19) little-plugger (1.1.4) - logging (2.1.0) + logging (2.2.0) little-plugger (~> 1.1) multi_json (~> 1.10) lograge (0.4.1) @@ -172,7 +172,7 @@ GEM minitest-rails (3.0.0) minitest (~> 5.8) railties (~> 5.0) - minitest-rails-capybara (3.0.0) + minitest-rails-capybara (3.0.1) capybara (~> 2.7) minitest-capybara (~> 0.8) minitest-metadata (~> 0.6) @@ -187,9 +187,8 @@ GEM multi_json (1.12.1) multi_xml (0.6.0) multipart-post (2.0.0) - newrelic_rpm (3.18.1.330) nio4r (2.0.0) - nokogiri (1.7.0.1) + nokogiri (1.7.1) mini_portile2 (~> 2.1.0) oauth2 (1.3.1) faraday (>= 0.8, < 0.12) @@ -209,7 +208,7 @@ GEM os (0.9.6) parser (2.4.0.0) ast (~> 2.2) - pg (0.19.0) + pg (0.20.0) powerpack (0.1.1) pry (0.10.4) coderay (~> 1.1.0) @@ -218,7 +217,7 @@ GEM pry-rails (0.3.5) pry (>= 0.9.10) public_suffix (2.0.5) - puma (3.7.1) + puma (3.8.2) rack (2.0.1) rack-test (0.6.3) rack (>= 1.0) @@ -257,7 +256,7 @@ GEM responders (2.3.0) railties (>= 4.2.0, < 5.1) retriable (3.0.1) - rollbar (2.14.0) + rollbar (2.14.1) multi_json rubocop (0.47.1) parser (>= 2.3.3.1, < 3.0) @@ -284,6 +283,8 @@ GEM json (>= 1.8, < 3) simplecov-html (~> 0.10.0) simplecov-html (0.10.0) + skylight (1.1.0) + activesupport (>= 3.0.0) slop (3.6.0) sprockets (3.7.1) concurrent-ruby (~> 1.0) @@ -300,12 +301,12 @@ GEM ref thor (0.19.4) thread_safe (0.3.6) - tilt (2.0.6) + tilt (2.0.7) tins (1.13.2) tzinfo (1.2.2) thread_safe (~> 0.1) uber (0.1.0) - uglifier (3.1.5) + uglifier (3.1.9) execjs (>= 0.3.0, < 3) unf (0.1.4) unf_ext @@ -351,7 +352,6 @@ DEPENDENCIES minitest-rails-capybara minitest-reporters mocha - newrelic_rpm nokogiri omniauth-mit-oauth2 omniauth-oauth2 @@ -363,6 +363,7 @@ DEPENDENCIES rollbar rubocop sass-rails + skylight sqlite3 therubyracer uglifier diff --git a/config/newrelic.yml b/config/newrelic.yml deleted file mode 100644 index 7d23bb80..00000000 --- a/config/newrelic.yml +++ /dev/null @@ -1,49 +0,0 @@ -# -# This file configures the New Relic Agent. New Relic monitors Ruby, Java, -# .NET, PHP, Python and Node applications with deep visibility and low -# overhead. For more information, visit www.newrelic.com. -# -# Generated September 27, 2016 -# -# This configuration file is custom generated for app53684319@heroku.com -# -# For full documentation of agent configuration options, please refer to -# https://docs.newrelic.com/docs/agents/ruby-agent/installation-configuration/ruby-agent-configuration - -common: &default_settings - # Required license key associated with your New Relic account. - license_key: <%= ENV['NEW_RELIC_LICENSE_KEY'] %> - - # Your application name. Renaming here affects where data displays in New - # Relic. For more details, see https://docs.newrelic.com/docs/apm/new-relic-apm/maintenance/renaming-applications - app_name: MIT Bento (<%= ENV['HEROKU_ENV'] %>) - - # To disable the agent regardless of other settings, uncomment the following: - # agent_enabled: false - - # Logging level for log/newrelic_agent.log - log_level: info - - -# Environment-specific settings are in this section. -# RAILS_ENV or RACK_ENV (as appropriate) is used to determine the environment. -# If your application has other named environments, configure them here. -development: - <<: *default_settings - app_name: MIT Bento (Development) - - # NOTE: There is substantial overhead when running in developer mode. - # Do not use for production or load testing. - developer_mode: true - -test: - <<: *default_settings - # It doesn't make sense to report to New Relic from automated test runs. - monitor_mode: false - -staging: - <<: *default_settings - app_name: MIT Bento (Staging) - -production: - <<: *default_settings