fixes #2716: Wiki pages should be undeletable

2016-10-18 15:17:50 -07:00
parent 2a5343b8cf
commit e78b7d2a8c
12 changed files with 55 additions and 24 deletions
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -336,9 +336,9 @@ GEM
      faraday (~> 0.9)
      jwt (~> 1.5)
      multi_json (~> 1.10)
-    simple_form (3.1.0)
-      actionpack (~> 4.0)
-      activemodel (~> 4.0)
+    simple_form (3.3.1)
+      actionpack (> 4, < 5.1)
+      activemodel (> 4, < 5.1)
    simple_oauth (0.3.1)
    simplecov (0.10.0)
      docile (~> 1.1.0)