Commit graph

3 commits

Author SHA1 Message Date
Reinier Balt
4a485558e2 Merge branch 'master' into rails4
Conflicts:
	Gemfile.lock
	config/routes.rb
2013-06-17 09:25:02 +02:00
Reinier Balt
08498fee4f fix failing tests
Includes a monkey patch for Arel that may need to be removed when 4.0.0 final ships
2013-05-13 15:35:21 +02:00
Reinier Balt
0bc9b0397a move tests to new directory 2013-05-11 23:13:16 +02:00
Renamed from test/functional/todos_controller_test.rb (Browse further)