github-migration/engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
e6c1d6e94e
engine/spec/lib/locomotive
History
Mario Visic 5f893d51c0 Merge remote-tracking branch 'origin/master' into rails_3_1 
Conflicts:
	Gemfile
	Gemfile.lock
	config/initializers/will_paginate.rb
	lib/locomotive/engine.rb
	lib/locomotive/hosting/bushido/account_ext.rb
	lib/locomotive/hosting/bushido/enabler.rb
	lib/locomotive/hosting/bushido/hooks.rb
2011-11-20 21:08:23 +11:00
..
httparty fix issue #91 2011-06-22 15:57:24 -07:00
liquid Replaced will_paginate with kaminari 2011-11-05 16:45:43 +11:00
routing Merge remote-tracking branch 'origin/master' into rails_3_1 2011-11-20 21:08:23 +11:00
bushido_spec.rb Ruby MRI 1.9.3 Compatability Fixes 2011-08-25 23:28:56 +02:00
configuration_spec.rb fix bug #111 2011-07-09 00:47:05 +02:00
export_spec.rb Ruby MRI 1.9.3 Compatability Fixes 2011-08-25 23:28:56 +02:00
heroku_spec.rb Ruby MRI 1.9.3 Compatability Fixes 2011-08-25 23:28:56 +02:00
import_spec.rb Ruby MRI 1.9.3 Compatability Fixes 2011-08-25 23:28:56 +02:00
render_spec.rb working on fixing issues with devise (wip) 2011-11-04 16:55:51 +01:00