upgrade to rails 4.2

Stephen Crosby
1 parent df414015
Showing 16 changed files with 89 additions and 63 deletions Show diff stats
.travis.yml
Gemfile
Gemfile.lock
app/controllers/api/v3/notices_controller.rb
app/models/comment.rb
app/models/deploy.rb
app/models/error_report.rb
config/application.rb
config/environments/test.rb
spec/controllers/api/v3/notices_controller_spec.rb
spec/initializers/action_mailer_spec.rb
spec/mailers/mailer_spec.rb
spec/models/comment_observer_spec.rb
spec/models/deploy_observer_spec.rb
spec/models/notice_observer_spec.rb
spec/spec_helper.rb
@@ -6,7 +6,7 @@ rvm:
   - ruby-head
   - jruby-head
 env:
-  - RAILS_ENV=test COVERAGE=true JRUBY_OPTS=--debug
+  - COVERAGE=true JRUBY_OPTS=--debug
 sudo: false
 cache: bundler
 before_script:
 source 'https://rubygems.org'
-RAILS_VERSION = '~> 4.1.11'
+RAILS_VERSION = '~> 4.2.0'
 send :ruby, ENV['GEMFILE_RUBY_VERSION'] if ENV['GEMFILE_RUBY_VERSION']
@@ -81,7 +81,7 @@ group :test do
   gem 'rspec-rails', '~> 3.0', require: false
   gem 'rspec-activemodel-mocks'
   gem 'rspec-its'
-  gem 'mongoid-rspec', require: false
+  gem 'mongoid-rspec', '~> 2.3.0.beta', require: false
   gem 'fabrication'
   gem 'capybara'
   gem 'poltergeist'
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.1.12)
-      actionpack (= 4.1.12)
-      actionview (= 4.1.12)
+    actionmailer (4.2.3)
+      actionpack (= 4.2.3)
+      actionview (= 4.2.3)
+      activejob (= 4.2.3)
       mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
     actionmailer_inline_css (1.5.3)
       actionmailer (>= 3.0.0)
       nokogiri (>= 1.4.4)
       premailer (>= 1.7.1)
-    actionpack (4.1.12)
-      actionview (= 4.1.12)
-      activesupport (= 4.1.12)
-      rack (~> 1.5.2)
+    actionpack (4.2.3)
+      actionview (= 4.2.3)
+      activesupport (= 4.2.3)
+      rack (~> 1.6)
       rack-test (~> 0.6.2)
-    actionview (4.1.12)
-      activesupport (= 4.1.12)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (4.2.3)
+      activesupport (= 4.2.3)
       builder (~> 3.1)
       erubis (~> 2.7.0)
-    activemodel (4.1.12)
-      activesupport (= 4.1.12)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    activejob (4.2.3)
+      activesupport (= 4.2.3)
+      globalid (>= 0.3.0)
+    activemodel (4.2.3)
+      activesupport (= 4.2.3)
       builder (~> 3.1)
-    activerecord (4.1.12)
-      activemodel (= 4.1.12)
-      activesupport (= 4.1.12)
-      arel (~> 5.0.0)
-    activesupport (4.1.12)
-      i18n (~> 0.6, >= 0.6.9)
+    activerecord (4.2.3)
+      activemodel (= 4.2.3)
+      activesupport (= 4.2.3)
+      arel (~> 6.0)
+    activesupport (4.2.3)
+      i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.1)
+      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     addressable (2.3.8)
     airbrake (4.3.0)
       builder
       multi_json
-    arel (5.0.1.20140414130214)
+    arel (6.0.3)
     bcrypt (3.1.10)
     bcrypt (3.1.10-java)
     better_errors (2.1.1)
@@ -127,6 +136,8 @@ GEM
     flowdock (0.6.0)
       httparty (~> 0.7)
       multi_json
+    globalid (0.3.6)
+      activesupport (>= 4.1.0)
     haml (4.0.6)
       tilt
     hashie (3.4.2)
@@ -162,6 +173,8 @@ GEM
       addressable (~> 2.3)
       spoon (~> 0.0.1)
     libv8 (3.16.14.7)
+    loofah (2.0.3)
+      nokogiri (>= 1.5.9)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
     meta_request (0.3.4)
@@ -172,7 +185,7 @@ GEM
     mime-types (2.6.1)
     mimemagic (0.3.0)
     mini_portile (0.6.2)
-    minitest (5.7.0)
+    minitest (5.8.0)
     mongo (2.1.0.beta)
       bson (~> 3.0)
     mongoid (5.0.0.beta)
@@ -180,10 +193,10 @@ GEM
       mongo (= 2.1.0.beta)
       origin (~> 2.1)
       tzinfo (>= 0.3.37)
-    mongoid-rspec (1.10.0)
-      mongoid (>= 3.0.1)
+    mongoid-rspec (2.3.0.beta)
+      mongoid (= 5.0.0.beta)
       rake
-      rspec (>= 2.14)
+      rspec (~> 3.3)
     mongoid_rails_migrations (1.0.1)
       activesupport (>= 3.2.0)
       bundler (>= 1.0.0)
@@ -246,7 +259,7 @@ GEM
       pry (>= 0.9.10)
     quiet_assets (1.1.0)
       railties (>= 3.1, < 5.0)
-    rack (1.5.5)
+    rack (1.6.4)
     rack-contrib (1.2.0)
       rack (>= 0.9.1)
     rack-ssl (1.4.1)
@@ -254,16 +267,25 @@ GEM
     rack-ssl-enforcer (0.2.8)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.1.12)
-      actionmailer (= 4.1.12)
-      actionpack (= 4.1.12)
-      actionview (= 4.1.12)
-      activemodel (= 4.1.12)
-      activerecord (= 4.1.12)
-      activesupport (= 4.1.12)
+    rails (4.2.3)
+      actionmailer (= 4.2.3)
+      actionpack (= 4.2.3)
+      actionview (= 4.2.3)
+      activejob (= 4.2.3)
+      activemodel (= 4.2.3)
+      activerecord (= 4.2.3)
+      activesupport (= 4.2.3)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.12)
-      sprockets-rails (~> 2.0)
+      railties (= 4.2.3)
+      sprockets-rails
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.7)
+      activesupport (>= 4.2.0.beta, < 5.0)
+      nokogiri (~> 1.6.0)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.0.2)
+      loofah (~> 2.0)
     rails_12factor (0.0.3)
       rails_serve_static_assets
       rails_stdout_logging
@@ -271,17 +293,17 @@ GEM
       rails (> 3.1)
     rails_serve_static_assets (0.0.4)
     rails_stdout_logging (0.0.3)
-    railties (4.1.12)
-      actionpack (= 4.1.12)
-      activesupport (= 4.1.12)
+    railties (4.2.3)
+      actionpack (= 4.2.3)
+      activesupport (= 4.2.3)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     raindrops (0.13.0)
     rake (10.4.2)
     ref (1.0.5)
     request_store (1.1.0)
-    responders (1.1.2)
-      railties (>= 3.2, < 4.2)
+    responders (2.1.0)
+      railties (>= 4.2.0, < 5)
     rest-client (1.8.0)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 3.0)
@@ -336,7 +358,7 @@ GEM
     slop (3.6.0)
     spoon (0.0.4)
       ffi
-    sprockets (3.2.0)
+    sprockets (3.3.3)
       rack (~> 1.0)
     sprockets-rails (2.3.2)
       actionpack (>= 3.0)
@@ -391,9 +413,9 @@ PLATFORMS
   ruby
 DEPENDENCIES
-  actionmailer (~> 4.1.11)
+  actionmailer (~> 4.2.0)
   actionmailer_inline_css
-  actionpack (~> 4.1.11)
+  actionpack (~> 4.2.0)
   airbrake
   better_errors
   binding_of_caller
@@ -426,7 +448,7 @@ DEPENDENCIES
   launchy
   meta_request
   mongoid (= 5.0.0.beta)
-  mongoid-rspec
+  mongoid-rspec (~> 2.3.0.beta)
   mongoid_rails_migrations
   omniauth-github
   pjax_rails
@@ -438,7 +460,7 @@ DEPENDENCIES
   rack-ssl-enforcer
   rails_12factor
   rails_autolink
-  railties (~> 4.1.11)
+  railties (~> 4.2.0)
   ri_cal
   rspec (~> 3.3)
   rspec-activemodel-mocks
@@ -13,10 +13,9 @@ class Api::V3::NoticesController &lt; ApplicationController
         report.generate_notice!
         render json: {
           id: report.notice.id,
-          url: app_problem_path(
+          url: app_problem_url(
             report.app,
-            report.error.problem_id,
-            only_path: false)
+            report.error.problem_id)
         }
       else
         render text: 'Notice for old app version ignored'
@@ -17,7 +17,7 @@ class Comment
   validates_presence_of :body
   def deliver_email
-    Mailer.comment_notification(self).deliver
+    Mailer.comment_notification(self).deliver_now
   end
   def notification_recipients
@@ -40,7 +40,7 @@ class Deploy
     def deliver_email
       if app.notify_on_deploys? && app.notification_recipients.any?
-        Mailer.deploy_notification(self).deliver
+        Mailer.deploy_notification(self).deliver_now
       end
     end
@@ -85,7 +85,7 @@ class ErrorReport
   def email_notification
     return false unless app.emailable?
     return false unless app.email_at_notices.include?(@problem.notices_count)
-    Mailer.err_notification(self).deliver
+    Mailer.err_notification(self).deliver_now
   rescue => e
     HoptoadNotifier.notify(e)
   end
@@ -20,7 +20,7 @@ module Errbit
     config.before_initialize do
       config.secret_key_base = Errbit::Config.secret_key_base
-      config.serve_static_assets = Errbit::Config.serve_static_assets
+      config.serve_static_files = Errbit::Config.serve_static_assets
     end
     initializer 'errbit.mongoid', before: 'mongoid.load-config' do
@@ -13,7 +13,7 @@ Rails.application.configure do
   config.eager_load = false
   # Configure static asset server for tests with Cache-Control for performance.
-  config.serve_static_assets  = true
+  config.serve_static_files = true
   config.static_cache_control = 'public, max-age=3600'
   # Show full error reports and disable caching.
@@ -11,7 +11,7 @@ describe Api::V3::NoticesController, type: :controller do
     notice = Notice.last
     expect(JSON.parse(response.body)).to eq({
       'id' => notice.id.to_s,
-      'url' => app_problem_path(app, notice.problem, only_path: false)
+      'url' => app_problem_url(app, notice.problem)
     })
   end
@@ -3,6 +3,10 @@ describe &#39;initializers/action_mailer&#39; do
     load File.join(Rails.root, 'config', 'initializers', 'action_mailer.rb')
   end
+  after do
+    ActionMailer::Base.delivery_method = :test
+  end
+
   describe 'delivery method' do
     it 'sets the delivery method to :smtp' do
       allow(Errbit::Config).to receive(:email_delivery_method).and_return(:smtp)
@@ -61,7 +61,7 @@ describe Mailer do
       )
     end
     let(:email) do
-      Mailer.err_notification(error_report).deliver
+      Mailer.err_notification(error_report).deliver_now
     end
     before { email }
@@ -77,7 +77,7 @@ describe Mailer do
     end
     it "should have links to source files" do
-      expect(email).to have_body_text('<a href="http://example.com/path/to/file.js" target="_blank">path/to/file.js')
+      expect(email).to have_body_text('<a target="_blank" href="http://example.com/path/to/file.js">path/to/file.js')
     end
     it "should have the error count in the subject" do
@@ -104,7 +104,7 @@ describe Mailer do
     before do
       expect(comment).to receive(:notification_recipients).and_return(recipients)
       Fabricate(:notice, :err => notice.err)
-      @email = Mailer.comment_notification(comment).deliver
+      @email = Mailer.comment_notification(comment).deliver_now
     end
     it "should be sent to comment notification recipients" do
@@ -8,7 +8,7 @@ describe &quot;Callback on Comment&quot;, type: &#39;model&#39; do
       it 'should send an email notification' do
         expect(Mailer).to receive(:comment_notification).
           with(comment).
-          and_return(double('email', :deliver => true))
+          and_return(double('email', :deliver_now => true))
         comment.save
       end
     end
@@ -3,7 +3,7 @@ describe &quot;Callback on Deploy&quot;, type: &#39;model&#39; do
     context 'and the app should notify on deploys' do
       it 'should send an email notification' do
         expect(Mailer).to receive(:deploy_notification).
-          and_return(double('email', :deliver => true))
+          and_return(double('email', :deliver_now => true))
         Fabricate(:deploy, :app => Fabricate(:app_with_watcher, :notify_on_deploys => true))
       end
     end
@@ -49,7 +49,7 @@ describe &quot;Callback on Notice&quot;, type: &#39;model&#39; do
         @problem.update_attributes notices_count: threshold - 1
         expect(Mailer).to receive(:err_notification).
-          and_return(double('email', :deliver => true))
+          and_return(double('email', :deliver_now => true))
         error_report = ErrorReport.new(notice_attrs)
         error_report.generate_notice!
@@ -95,7 +95,7 @@ describe &quot;Callback on Notice&quot;, type: &#39;model&#39; do
       err.problem.resolve!
       expect(Mailer).to receive(:err_notification)
-        .and_return(double('email', :deliver => true))
+        .and_return(double('email', :deliver_now => true))
       ErrorReport.new(notice_attrs).generate_notice!
     end
@@ -121,7 +121,7 @@ describe &quot;Callback on Notice&quot;, type: &#39;model&#39; do
       expect(error_report.app.notification_service)
         .to receive(:create_notification).and_raise(ArgumentError)
       expect(Mailer)
-        .to receive(:err_notification).and_return(double(:deliver => true))
+        .to receive(:err_notification).and_return(double(:deliver_now => true))
       error_report.generate_notice!
     end
@@ -33,6 +33,7 @@ require &#39;errbit_plugin/mock_issue_tracker&#39;
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 Mongoid::Config.truncate!
 Mongoid::Tasks::Database.create_indexes
+ActionMailer::Base.delivery_method = :test
 RSpec.configure do |config|
   config.include Devise::TestHelpers, :type => :controller
	@@ -6,7 +6,7 @@ rvm:		@@ -6,7 +6,7 @@ rvm:
6	- ruby-head	6	- ruby-head
7	- jruby-head	7	- jruby-head
8	env:	8	env:
9	- - RAILS_ENV=test COVERAGE=true JRUBY_OPTS=--debug	9	+ - COVERAGE=true JRUBY_OPTS=--debug
10	sudo: false	10	sudo: false
11	cache: bundler	11	cache: bundler
12	before_script:	12	before_script:
1	source 'https://rubygems.org'	1	source 'https://rubygems.org'
2		2
3	-RAILS_VERSION = '~> 4.1.11'	3	+RAILS_VERSION = '~> 4.2.0'
4		4
5	send :ruby, ENV['GEMFILE_RUBY_VERSION'] if ENV['GEMFILE_RUBY_VERSION']	5	send :ruby, ENV['GEMFILE_RUBY_VERSION'] if ENV['GEMFILE_RUBY_VERSION']
6		6
	@@ -81,7 +81,7 @@ group :test do		@@ -81,7 +81,7 @@ group :test do
81	gem 'rspec-rails', '~> 3.0', require: false	81	gem 'rspec-rails', '~> 3.0', require: false
82	gem 'rspec-activemodel-mocks'	82	gem 'rspec-activemodel-mocks'
83	gem 'rspec-its'	83	gem 'rspec-its'
84	- gem 'mongoid-rspec', require: false	84	+ gem 'mongoid-rspec', '~> 2.3.0.beta', require: false
85	gem 'fabrication'	85	gem 'fabrication'
86	gem 'capybara'	86	gem 'capybara'
87	gem 'poltergeist'	87	gem 'poltergeist'
1	GEM	1	GEM
2	remote: https://rubygems.org/	2	remote: https://rubygems.org/
3	specs:	3	specs:
4	- actionmailer (4.1.12)
5	- actionpack (= 4.1.12)
6	- actionview (= 4.1.12)	4	+ actionmailer (4.2.3)
		5	+ actionpack (= 4.2.3)
		6	+ actionview (= 4.2.3)
		7	+ activejob (= 4.2.3)
7	mail (~> 2.5, >= 2.5.4)	8	mail (~> 2.5, >= 2.5.4)
		9	+ rails-dom-testing (~> 1.0, >= 1.0.5)
8	actionmailer_inline_css (1.5.3)	10	actionmailer_inline_css (1.5.3)
9	actionmailer (>= 3.0.0)	11	actionmailer (>= 3.0.0)
10	nokogiri (>= 1.4.4)	12	nokogiri (>= 1.4.4)
11	premailer (>= 1.7.1)	13	premailer (>= 1.7.1)
12	- actionpack (4.1.12)
13	- actionview (= 4.1.12)
14	- activesupport (= 4.1.12)
15	- rack (~> 1.5.2)	14	+ actionpack (4.2.3)
		15	+ actionview (= 4.2.3)
		16	+ activesupport (= 4.2.3)
		17	+ rack (~> 1.6)
16	rack-test (~> 0.6.2)	18	rack-test (~> 0.6.2)
17	- actionview (4.1.12)
18	- activesupport (= 4.1.12)	19	+ rails-dom-testing (~> 1.0, >= 1.0.5)
		20	+ rails-html-sanitizer (~> 1.0, >= 1.0.2)
		21	+ actionview (4.2.3)
		22	+ activesupport (= 4.2.3)
19	builder (~> 3.1)	23	builder (~> 3.1)
20	erubis (~> 2.7.0)	24	erubis (~> 2.7.0)
21	- activemodel (4.1.12)
22	- activesupport (= 4.1.12)	25	+ rails-dom-testing (~> 1.0, >= 1.0.5)
		26	+ rails-html-sanitizer (~> 1.0, >= 1.0.2)
		27	+ activejob (4.2.3)
		28	+ activesupport (= 4.2.3)
		29	+ globalid (>= 0.3.0)
		30	+ activemodel (4.2.3)
		31	+ activesupport (= 4.2.3)
23	builder (~> 3.1)	32	builder (~> 3.1)
24	- activerecord (4.1.12)
25	- activemodel (= 4.1.12)
26	- activesupport (= 4.1.12)
27	- arel (~> 5.0.0)
28	- activesupport (4.1.12)
29	- i18n (~> 0.6, >= 0.6.9)	33	+ activerecord (4.2.3)
		34	+ activemodel (= 4.2.3)
		35	+ activesupport (= 4.2.3)
		36	+ arel (~> 6.0)
		37	+ activesupport (4.2.3)
		38	+ i18n (~> 0.7)
30	json (~> 1.7, >= 1.7.7)	39	json (~> 1.7, >= 1.7.7)
31	minitest (~> 5.1)	40	minitest (~> 5.1)
32	- thread_safe (~> 0.1)	41	+ thread_safe (~> 0.3, >= 0.3.4)
33	tzinfo (~> 1.1)	42	tzinfo (~> 1.1)
34	addressable (2.3.8)	43	addressable (2.3.8)
35	airbrake (4.3.0)	44	airbrake (4.3.0)
36	builder	45	builder
37	multi_json	46	multi_json
38	- arel (5.0.1.20140414130214)	47	+ arel (6.0.3)
39	bcrypt (3.1.10)	48	bcrypt (3.1.10)
40	bcrypt (3.1.10-java)	49	bcrypt (3.1.10-java)
41	better_errors (2.1.1)	50	better_errors (2.1.1)
	@@ -127,6 +136,8 @@ GEM		@@ -127,6 +136,8 @@ GEM
127	flowdock (0.6.0)	136	flowdock (0.6.0)
128	httparty (~> 0.7)	137	httparty (~> 0.7)
129	multi_json	138	multi_json
		139	+ globalid (0.3.6)
		140	+ activesupport (>= 4.1.0)
130	haml (4.0.6)	141	haml (4.0.6)
131	tilt	142	tilt
132	hashie (3.4.2)	143	hashie (3.4.2)
	@@ -162,6 +173,8 @@ GEM		@@ -162,6 +173,8 @@ GEM
162	addressable (~> 2.3)	173	addressable (~> 2.3)
163	spoon (~> 0.0.1)	174	spoon (~> 0.0.1)
164	libv8 (3.16.14.7)	175	libv8 (3.16.14.7)
		176	+ loofah (2.0.3)
		177	+ nokogiri (>= 1.5.9)
165	mail (2.6.3)	178	mail (2.6.3)
166	mime-types (>= 1.16, < 3)	179	mime-types (>= 1.16, < 3)
167	meta_request (0.3.4)	180	meta_request (0.3.4)
	@@ -172,7 +185,7 @@ GEM		@@ -172,7 +185,7 @@ GEM
172	mime-types (2.6.1)	185	mime-types (2.6.1)
173	mimemagic (0.3.0)	186	mimemagic (0.3.0)
174	mini_portile (0.6.2)	187	mini_portile (0.6.2)
175	- minitest (5.7.0)	188	+ minitest (5.8.0)
176	mongo (2.1.0.beta)	189	mongo (2.1.0.beta)
177	bson (~> 3.0)	190	bson (~> 3.0)
178	mongoid (5.0.0.beta)	191	mongoid (5.0.0.beta)
	@@ -180,10 +193,10 @@ GEM		@@ -180,10 +193,10 @@ GEM
180	mongo (= 2.1.0.beta)	193	mongo (= 2.1.0.beta)
181	origin (~> 2.1)	194	origin (~> 2.1)
182	tzinfo (>= 0.3.37)	195	tzinfo (>= 0.3.37)
183	- mongoid-rspec (1.10.0)
184	- mongoid (>= 3.0.1)	196	+ mongoid-rspec (2.3.0.beta)
		197	+ mongoid (= 5.0.0.beta)
185	rake	198	rake
186	- rspec (>= 2.14)	199	+ rspec (~> 3.3)
187	mongoid_rails_migrations (1.0.1)	200	mongoid_rails_migrations (1.0.1)
188	activesupport (>= 3.2.0)	201	activesupport (>= 3.2.0)
189	bundler (>= 1.0.0)	202	bundler (>= 1.0.0)
	@@ -246,7 +259,7 @@ GEM		@@ -246,7 +259,7 @@ GEM
246	pry (>= 0.9.10)	259	pry (>= 0.9.10)
247	quiet_assets (1.1.0)	260	quiet_assets (1.1.0)
248	railties (>= 3.1, < 5.0)	261	railties (>= 3.1, < 5.0)
249	- rack (1.5.5)	262	+ rack (1.6.4)
250	rack-contrib (1.2.0)	263	rack-contrib (1.2.0)
251	rack (>= 0.9.1)	264	rack (>= 0.9.1)
252	rack-ssl (1.4.1)	265	rack-ssl (1.4.1)
	@@ -254,16 +267,25 @@ GEM		@@ -254,16 +267,25 @@ GEM
254	rack-ssl-enforcer (0.2.8)	267	rack-ssl-enforcer (0.2.8)
255	rack-test (0.6.3)	268	rack-test (0.6.3)
256	rack (>= 1.0)	269	rack (>= 1.0)
257	- rails (4.1.12)
258	- actionmailer (= 4.1.12)
259	- actionpack (= 4.1.12)
260	- actionview (= 4.1.12)
261	- activemodel (= 4.1.12)
262	- activerecord (= 4.1.12)
263	- activesupport (= 4.1.12)	270	+ rails (4.2.3)
		271	+ actionmailer (= 4.2.3)
		272	+ actionpack (= 4.2.3)
		273	+ actionview (= 4.2.3)
		274	+ activejob (= 4.2.3)
		275	+ activemodel (= 4.2.3)
		276	+ activerecord (= 4.2.3)
		277	+ activesupport (= 4.2.3)
264	bundler (>= 1.3.0, < 2.0)	278	bundler (>= 1.3.0, < 2.0)
265	- railties (= 4.1.12)
266	- sprockets-rails (~> 2.0)	279	+ railties (= 4.2.3)
		280	+ sprockets-rails
		281	+ rails-deprecated_sanitizer (1.0.3)
		282	+ activesupport (>= 4.2.0.alpha)
		283	+ rails-dom-testing (1.0.7)
		284	+ activesupport (>= 4.2.0.beta, < 5.0)
		285	+ nokogiri (~> 1.6.0)
		286	+ rails-deprecated_sanitizer (>= 1.0.1)
		287	+ rails-html-sanitizer (1.0.2)
		288	+ loofah (~> 2.0)
267	rails_12factor (0.0.3)	289	rails_12factor (0.0.3)
268	rails_serve_static_assets	290	rails_serve_static_assets
269	rails_stdout_logging	291	rails_stdout_logging
	@@ -271,17 +293,17 @@ GEM		@@ -271,17 +293,17 @@ GEM
271	rails (> 3.1)	293	rails (> 3.1)
272	rails_serve_static_assets (0.0.4)	294	rails_serve_static_assets (0.0.4)
273	rails_stdout_logging (0.0.3)	295	rails_stdout_logging (0.0.3)
274	- railties (4.1.12)
275	- actionpack (= 4.1.12)
276	- activesupport (= 4.1.12)	296	+ railties (4.2.3)
		297	+ actionpack (= 4.2.3)
		298	+ activesupport (= 4.2.3)
277	rake (>= 0.8.7)	299	rake (>= 0.8.7)
278	thor (>= 0.18.1, < 2.0)	300	thor (>= 0.18.1, < 2.0)
279	raindrops (0.13.0)	301	raindrops (0.13.0)
280	rake (10.4.2)	302	rake (10.4.2)
281	ref (1.0.5)	303	ref (1.0.5)
282	request_store (1.1.0)	304	request_store (1.1.0)
283	- responders (1.1.2)
284	- railties (>= 3.2, < 4.2)	305	+ responders (2.1.0)
		306	+ railties (>= 4.2.0, < 5)
285	rest-client (1.8.0)	307	rest-client (1.8.0)
286	http-cookie (>= 1.0.2, < 2.0)	308	http-cookie (>= 1.0.2, < 2.0)
287	mime-types (>= 1.16, < 3.0)	309	mime-types (>= 1.16, < 3.0)
	@@ -336,7 +358,7 @@ GEM		@@ -336,7 +358,7 @@ GEM
336	slop (3.6.0)	358	slop (3.6.0)
337	spoon (0.0.4)	359	spoon (0.0.4)
338	ffi	360	ffi
339	- sprockets (3.2.0)	361	+ sprockets (3.3.3)
340	rack (~> 1.0)	362	rack (~> 1.0)
341	sprockets-rails (2.3.2)	363	sprockets-rails (2.3.2)
342	actionpack (>= 3.0)	364	actionpack (>= 3.0)
	@@ -391,9 +413,9 @@ PLATFORMS		@@ -391,9 +413,9 @@ PLATFORMS
391	ruby	413	ruby
392		414
393	DEPENDENCIES	415	DEPENDENCIES
394	- actionmailer (~> 4.1.11)	416	+ actionmailer (~> 4.2.0)
395	actionmailer_inline_css	417	actionmailer_inline_css
396	- actionpack (~> 4.1.11)	418	+ actionpack (~> 4.2.0)
397	airbrake	419	airbrake
398	better_errors	420	better_errors
399	binding_of_caller	421	binding_of_caller
	@@ -426,7 +448,7 @@ DEPENDENCIES		@@ -426,7 +448,7 @@ DEPENDENCIES
426	launchy	448	launchy
427	meta_request	449	meta_request
428	mongoid (= 5.0.0.beta)	450	mongoid (= 5.0.0.beta)
429	- mongoid-rspec	451	+ mongoid-rspec (~> 2.3.0.beta)
430	mongoid_rails_migrations	452	mongoid_rails_migrations
431	omniauth-github	453	omniauth-github
432	pjax_rails	454	pjax_rails
	@@ -438,7 +460,7 @@ DEPENDENCIES		@@ -438,7 +460,7 @@ DEPENDENCIES
438	rack-ssl-enforcer	460	rack-ssl-enforcer
439	rails_12factor	461	rails_12factor
440	rails_autolink	462	rails_autolink
441	- railties (~> 4.1.11)	463	+ railties (~> 4.2.0)
442	ri_cal	464	ri_cal
443	rspec (~> 3.3)	465	rspec (~> 3.3)
444	rspec-activemodel-mocks	466	rspec-activemodel-mocks
	@@ -17,7 +17,7 @@ class Comment		@@ -17,7 +17,7 @@ class Comment
17	validates_presence_of :body	17	validates_presence_of :body
18		18
19	def deliver_email	19	def deliver_email
20	- Mailer.comment_notification(self).deliver	20	+ Mailer.comment_notification(self).deliver_now
21	end	21	end
22		22
23	def notification_recipients	23	def notification_recipients
	@@ -40,7 +40,7 @@ class Deploy		@@ -40,7 +40,7 @@ class Deploy
40		40
41	def deliver_email	41	def deliver_email
42	if app.notify_on_deploys? && app.notification_recipients.any?	42	if app.notify_on_deploys? && app.notification_recipients.any?
43	- Mailer.deploy_notification(self).deliver	43	+ Mailer.deploy_notification(self).deliver_now
44	end	44	end
45	end	45	end
46		46
	@@ -85,7 +85,7 @@ class ErrorReport		@@ -85,7 +85,7 @@ class ErrorReport
85	def email_notification	85	def email_notification
86	return false unless app.emailable?	86	return false unless app.emailable?
87	return false unless app.email_at_notices.include?(@problem.notices_count)	87	return false unless app.email_at_notices.include?(@problem.notices_count)
88	- Mailer.err_notification(self).deliver	88	+ Mailer.err_notification(self).deliver_now
89	rescue => e	89	rescue => e
90	HoptoadNotifier.notify(e)	90	HoptoadNotifier.notify(e)
91	end	91	end
	@@ -20,7 +20,7 @@ module Errbit		@@ -20,7 +20,7 @@ module Errbit
20		20
21	config.before_initialize do	21	config.before_initialize do
22	config.secret_key_base = Errbit::Config.secret_key_base	22	config.secret_key_base = Errbit::Config.secret_key_base
23	- config.serve_static_assets = Errbit::Config.serve_static_assets	23	+ config.serve_static_files = Errbit::Config.serve_static_assets
24	end	24	end
25		25
26	initializer 'errbit.mongoid', before: 'mongoid.load-config' do	26	initializer 'errbit.mongoid', before: 'mongoid.load-config' do
	@@ -13,7 +13,7 @@ Rails.application.configure do		@@ -13,7 +13,7 @@ Rails.application.configure do
13	config.eager_load = false	13	config.eager_load = false
14		14
15	# Configure static asset server for tests with Cache-Control for performance.	15	# Configure static asset server for tests with Cache-Control for performance.
16	- config.serve_static_assets = true	16	+ config.serve_static_files = true
17	config.static_cache_control = 'public, max-age=3600'	17	config.static_cache_control = 'public, max-age=3600'
18		18
19	# Show full error reports and disable caching.	19	# Show full error reports and disable caching.
	@@ -11,7 +11,7 @@ describe Api::V3::NoticesController, type: :controller do		@@ -11,7 +11,7 @@ describe Api::V3::NoticesController, type: :controller do
11	notice = Notice.last	11	notice = Notice.last
12	expect(JSON.parse(response.body)).to eq({	12	expect(JSON.parse(response.body)).to eq({
13	'id' => notice.id.to_s,	13	'id' => notice.id.to_s,
14	- 'url' => app_problem_path(app, notice.problem, only_path: false)	14	+ 'url' => app_problem_url(app, notice.problem)
15	})	15	})
16	end	16	end
17		17
	@@ -61,7 +61,7 @@ describe Mailer do		@@ -61,7 +61,7 @@ describe Mailer do
61	)	61	)
62	end	62	end
63	let(:email) do	63	let(:email) do
64	- Mailer.err_notification(error_report).deliver	64	+ Mailer.err_notification(error_report).deliver_now
65	end	65	end
66		66
67	before { email }	67	before { email }
	@@ -77,7 +77,7 @@ describe Mailer do		@@ -77,7 +77,7 @@ describe Mailer do
77	end	77	end
78		78
79	it "should have links to source files" do	79	it "should have links to source files" do
80	- expect(email).to have_body_text('<a href="http://example.com/path/to/file.js" target="_blank">path/to/file.js')	80	+ expect(email).to have_body_text('<a target="_blank" href="http://example.com/path/to/file.js">path/to/file.js')
81	end	81	end
82		82
83	it "should have the error count in the subject" do	83	it "should have the error count in the subject" do
	@@ -104,7 +104,7 @@ describe Mailer do		@@ -104,7 +104,7 @@ describe Mailer do
104	before do	104	before do
105	expect(comment).to receive(:notification_recipients).and_return(recipients)	105	expect(comment).to receive(:notification_recipients).and_return(recipients)
106	Fabricate(:notice, :err => notice.err)	106	Fabricate(:notice, :err => notice.err)
107	- @email = Mailer.comment_notification(comment).deliver	107	+ @email = Mailer.comment_notification(comment).deliver_now
108	end	108	end
109		109
110	it "should be sent to comment notification recipients" do	110	it "should be sent to comment notification recipients" do