Jonne Haß ccd7c670b3 Merge pull request #5170 from khall/issue_5149a ... Issue 5149a Conflicts: spec/controllers/aspects_controller_spec.rb spec/controllers/contacts_controller_spec.rb		2014-08-27 18:20:56 +02:00
..
controllers	Merge pull request #5170 from khall/issue_5149a	2014-08-27 18:20:56 +02:00
fixtures
helpers	Two tests failing after rspec 2.99 => 3.0.0	2014-08-26 17:10:26 -07:00
integration	No deprecation warnings, but one spec still fails (but only when I run all the specs, not when I run just the one spec)	2014-08-26 17:10:29 -07:00
javascripts	Merge pull request #5153 from svbergerem/redesign-contacts-page	2014-08-27 10:01:41 +02:00
lib	Merge branch 'develop' into issue_5149	2014-08-26 17:11:39 -07:00
mailers	Two tests failing after rspec 2.99 => 3.0.0	2014-08-26 17:10:26 -07:00
models	Merge pull request #5170 from khall/issue_5149a	2014-08-27 18:20:56 +02:00
presenters	Two tests failing after rspec 2.99 => 3.0.0	2014-08-26 17:10:26 -07:00
shared_behaviors	Two tests failing after rspec 2.99 => 3.0.0	2014-08-26 17:10:26 -07:00
support
workers	No deprecation warnings, but one spec still fails (but only when I run all the specs, not when I run just the one spec)	2014-08-26 17:10:29 -07:00
factories.rb
helper_methods.rb
locale_spec.rb
misc_spec.rb	Two tests failing after rspec 2.99 => 3.0.0	2014-08-26 17:10:26 -07:00
spec-doc.rb
spec_helper.rb	Fixing a .should test to expect(), adding suggested line to spec_helper to prevent the use of .should in the future	2014-08-26 17:39:13 -07:00