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

config: remove unneeded config options.

Browse Source
This commit is contained in:
evazion
2020-01-07 19:35:57 -06:00
parent 3d3f615591
commit e28a955535
2 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/views/posts/partials/show/_notices.html.erb
View File

@@ -23,8 +23,9 @@
<%= render "post_disapprovals/counts", :disapprovals => post.disapprovals, :post => post %> <%= render "post_disapprovals/counts", :disapprovals => post.disapprovals, :post => post %>
<% if CurrentUser.id == post.uploader_id && Danbooru.config.upload_feedback_topic.present? %> <% if CurrentUser.id == post.uploader_id %>
<p>If you don't understand why your uploads keep getting deleted, you should ask on the <%= link_to "forum", forum_topic_path(Danbooru.config.upload_feedback_topic) %> for advice.</p> <p>If you don't understand why your upload was deleted, you can ask for
advice in the Upload Feedback Thread on the forum.</p>
<% end %> <% end %>
</div> </div>
<% end %> <% end %>

11
config/danbooru_default_config.rb
View File

@@ -53,10 +53,6 @@ module Danbooru
"DanbooruBot" "DanbooruBot"
end end
def upload_feedback_topic
ForumTopic.where(title: "Upload Feedback Thread").first
end
# The ID of the "Curated" pool. If present, this pool will be updated daily with curated posts. # The ID of the "Curated" pool. If present, this pool will be updated daily with curated posts.
def curated_pool_id def curated_pool_id
nil nil
@@ -192,13 +188,6 @@ module Danbooru
Socket.gethostname Socket.gethostname
end end
# Names of all Danbooru servers which serve out of the same common database.
# Used in conjunction with load balancing to distribute files from one server to
# the others. This should match whatever gethostname returns on the other servers.
def all_server_hosts
[server_host]
end
# The method to use for storing image files. # The method to use for storing image files.
def storage_manager def storage_manager
# Store files on the local filesystem. # Store files on the local filesystem.