Merge branch 'master' of https://github.com/r888888888/danbooru

2014-07-15 01:32:04 -04:00
parent 20cceda4e5 2a97811b1c
commit 11133ba2b0
4 changed files with 2 additions and 9 deletions
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -447,7 +447,7 @@ class User < ActiveRecord::Base
    end

    def show_saved_searches?
-      id < 1_000
+      id < 50_000
    end

    def can_upload?
--- a/app/views/users/upgrade_information.html.erb
+++ b/app/views/users/upgrade_information.html.erb
@@ -49,12 +49,6 @@
            <td>Yes</td>
            <td>Yes</td>
          </tr>
-          <tr>
-            <td>See Banned Posts</td>
-            <td>No</td>
-            <td>Yes</td>
-            <td>Yes</td>
-          </tr>
          <tr>
            <td>See Censored Tags</td>
            <td>No</td>