jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Toks
2014-07-15 01:32:04 -04:00
parent 20cceda4e5 2a97811b1c
commit 11133ba2b0
4 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Gemfile.lock
View File

@@ -15,7 +15,6 @@ GIT
ruby-imagespec (0.3.1) ruby-imagespec (0.3.1)
GEM GEM
remote: http://gemcutter.org/
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
actionmailer (4.1.0) actionmailer (4.1.0)

2
app/models/user.rb
View File

@@ -447,7 +447,7 @@ class User < ActiveRecord::Base
end end
def show_saved_searches? def show_saved_searches?
id < 1_000 id < 50_000
end end
def can_upload? def can_upload?

6
app/views/users/upgrade_information.html.erb
View File

@@ -49,12 +49,6 @@
<td>Yes</td> <td>Yes</td>
<td>Yes</td> <td>Yes</td>
</tr> </tr>
<tr>
<td>See Banned Posts</td>
<td>No</td>
<td>Yes</td>
<td>Yes</td>
</tr>
<tr> <tr>
<td>See Censored Tags</td> <td>See Censored Tags</td>
<td>No</td> <td>No</td>

2
config/danbooru_default_config.rb
View File

@@ -4,7 +4,7 @@ module Danbooru
class Configuration class Configuration
# The version of this Danbooru. # The version of this Danbooru.
def version def version
"2.54.3" "2.55.0"
end end
# The name of this Danbooru. # The name of this Danbooru.