migrate to Rails 4.0 (closes foodcoops#214)

Conflicts:
	Gemfile.lock
This commit is contained in:
wvengen 2014-02-20 15:04:53 +01:00
parent 12d1221bfc
commit 7841245795
97 changed files with 659 additions and 557 deletions

View file

@ -15,5 +15,5 @@
%td= truncate stock_taking.note
%td
= link_to t('ui.edit'), edit_stock_taking_path(stock_taking), class: 'btn btn-mini'
= link_to t('ui.delete'), stock_taking, :confirm => t('.confirm_delete'), :method => :delete,
= link_to t('ui.delete'), stock_taking, :data => {:confirm => t('.confirm_delete')}, :method => :delete,
class: 'btn btn-mini btn-danger'