migrate to Rails 4.0 (closes foodcoops#214)

Conflicts: Gemfile.lock
2014-02-20 15:04:53 +01:00 · 2014-02-20 15:04:53 +01:00 · 7841245795
commit 7841245795
parent 12d1221bfc
97 changed files with 659 additions and 557 deletions
--- a/app/views/home/profile.html.haml
+++ b/app/views/home/profile.html.haml
@ -19,5 +19,5 @@
            remote: true, class: 'btn btn-success btn-small'
          - if membership.group.type != 'Ordergroup'
            %td= link_to t('.groups.cancel'), cancel_membership_path(membership_id: membership),
-              confirm: t('.groups.cancel_confirm'), method: :post,
+              :data => {confirm: t('.groups.cancel_confirm')}, method: :post,
              class: 'btn btn-danger btn-small'