Merge branch 'wiki'

Conflicts: app/views/layouts/_project_menu.html.haml
2012-02-21 20:32:43 +02:00 · 2012-02-21 20:32:43 +02:00 · ce8eba8913
commit ce8eba8913
parent 5c492a7089 621bfdb4aa
22 changed files with 294 additions and 17 deletions
--- a/app/views/projects/_form.html.haml
+++ b/app/views/projects/_form.html.haml
@ -41,6 +41,10 @@
      .clearfix
        = f.label :wall_enabled, "Wall"
        .input= f.check_box :wall_enabled
+      
+      .clearfix
+        = f.label :wiki_enabled, "Wiki"
+        .input= f.check_box :wiki_enabled
    
  .clearfix
    = f.label :description