Merge commit '1cdb9e8501' into rails3-multiple-recurring-tasks

Conflicts: Gemfile db/schema.rb
2013-03-15 17:59:19 +01:00 · 2013-03-15 17:59:19 +01:00 · 981944b869
commit 981944b869
parent a096b3618c 1cdb9e8501
7 changed files with 75 additions and 3 deletions
--- a/app/views/tasks/_form.html.haml
+++ b/app/views/tasks/_form.html.haml
@ -23,6 +23,7 @@
  = f.input :required_users
  = f.association :workgroup
  = f.input :due_date, as: :date_picker
+  = f.input :periodic, as: :boolean
  = f.input :done
  .form-actions
    = f.submit class: 'btn'