Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

migrate to Rails 4.0 (closes foodcoops#214)

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

2
lib/foodsoft_wiki/app/views/pages/show.html.haml
View file

@ -47,5 +47,5 @@
= link_to edit_page_path(@page), class: 'btn btn-primary' do
%i.icon-edit= t '.edit'
= link_to t('.delete'), @page, class: 'btn btn-danger', :method => :delete,
:confirm => t('.delete_confirm')
:data => {:confirm => t('.delete_confirm')}
!= '| ' + t('.last_updated', user: show_user(@page.user), when: format_datetime(@page.updated_at))