diff --git a/.env b/.env index 08f7601dc..2c7731b6b 100644 --- a/.env +++ b/.env @@ -35,7 +35,7 @@ # Put these in .env.production or .env.development to define your dev/prod # databases. Do not define it in .env or .env.local! It will be taken as your # test database too, and rails will wipe it if you run the test suite. -# +# # If you are connecting to PostgreSQL via socket, omit the hostname (e.g. # postgresql:///danbooru2) # export DATABASE_URL="postgresql://localhost/danbooru2" diff --git a/LICENSE b/LICENSE index e090d82d2..c2f0eac0b 100644 --- a/LICENSE +++ b/LICENSE @@ -2,13 +2,13 @@ Copyright (c) 2013, Danbooru Project All rights reserved. Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: +modification, are permitted provided that the following conditions are met: 1. Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. + list of conditions and the following disclaimer. 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. + and/or other materials provided with the distribution. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED @@ -22,5 +22,5 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. The views and conclusions contained in the software and documentation are those -of the authors and should not be interpreted as representing official policies, +of the authors and should not be interpreted as representing official policies, either expressed or implied, of the FreeBSD Project. diff --git a/README.md b/README.md index b6834fdff..9eb9c9540 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ simple to adapt for other platforms. For best performance, you will need at least 256MB of RAM for PostgreSQL and Rails. The memory requirement will grow as your -database gets bigger. +database gets bigger. On production Danbooru uses PostgreSQL 9.4, but any 9.x release should work. @@ -41,7 +41,7 @@ debug your Nginx configuration file. ## Services -Danbooru employs numerous external services to delegate some +Danbooru employs numerous external services to delegate some functionality. For development purposes, you can just run mocked version of these @@ -50,7 +50,7 @@ automatically using Foreman and the provided Procfile. ### Amazon Web Services -In order to enable the following features, you will need an AWS SQS +In order to enable the following features, you will need an AWS SQS account: * Pool versions @@ -68,11 +68,11 @@ The following features requires a Google API account: ### IQDB Service -IQDB integration is delegated to the [IQDBS service](https://github.com/r888888888/iqdbs). +IQDB integration is delegated to the [IQDBS service](https://github.com/r888888888/iqdbs). ### Archive Service -In order to access versioned data for pools and posts you will +In order to access versioned data for pools and posts you will need to install and configure the [Archives service](https://github.com/r888888888/archives). ### Reportbooru Service diff --git a/app/views/comments/partials/show/_comment.html.erb b/app/views/comments/partials/show/_comment.html.erb index 0dea551d8..b3b52b712 100644 --- a/app/views/comments/partials/show/_comment.html.erb +++ b/app/views/comments/partials/show/_comment.html.erb @@ -30,7 +30,7 @@ <%= format_text(comment.body, data: dtext_data) %> <%= render "application/update_notice", record: comment %> - + <% if policy(comment).create? %> <% if context == :index_by_comment %> diff --git a/app/views/forum_post_votes/_list.html.erb b/app/views/forum_post_votes/_list.html.erb index 75653e2ed..90a9c6297 100644 --- a/app/views/forum_post_votes/_list.html.erb +++ b/app/views/forum_post_votes/_list.html.erb @@ -1,5 +1,5 @@ -<%- -# votes +<%- +# votes # forum_post %> diff --git a/app/views/forum_posts/_forum_post.html.erb b/app/views/forum_posts/_forum_post.html.erb index 4f08f5fa9..3904f112a 100644 --- a/app/views/forum_posts/_forum_post.html.erb +++ b/app/views/forum_posts/_forum_post.html.erb @@ -1,5 +1,5 @@ <% if policy(forum_post).show_deleted? %> -
data-is-reported="<%= moderation_reports.pluck(:model_id).include?(forum_post.id) %>" diff --git a/app/views/forum_topics/_secondary_links.html.erb b/app/views/forum_topics/_secondary_links.html.erb index 2aabcb132..9ce1011e7 100644 --- a/app/views/forum_topics/_secondary_links.html.erb +++ b/app/views/forum_topics/_secondary_links.html.erb @@ -1,7 +1,7 @@ <% content_for(:secondary_links) do %> <%= quick_search_form_for(:body_matches, forum_posts_path, "forum posts") %> <%= subnav_link_to "Listing", forum_topics_path %> - + <% if policy(ForumTopic).create? %> <%= subnav_link_to "New", new_forum_topic_path %> <% end %> @@ -14,7 +14,7 @@ <% else %> <%= subnav_link_to "Request alias/implication", new_bulk_update_request_path %> <% end %> - + <%= subnav_link_to "Search", search_forum_posts_path %> <%= subnav_link_to "Help", wiki_page_path("help:forum") %> <% if CurrentUser.is_member? && @forum_topic && !@forum_topic.new_record? %> diff --git a/app/views/forum_topics/index.html.erb b/app/views/forum_topics/index.html.erb index eeb50a9b8..70c9af84f 100644 --- a/app/views/forum_topics/index.html.erb +++ b/app/views/forum_topics/index.html.erb @@ -9,7 +9,7 @@

Categories: - <%= link_to "All", forum_topics_path %>, + <%= link_to "All", forum_topics_path %>, <%= link_to "New", forum_topics_path(search: { is_read: false }) %>, <% if policy(ForumTopic).moderate? %> <%= link_to "Private", forum_topics_path(search: { is_private: true }) %>, diff --git a/app/views/layouts/default.html.erb b/app/views/layouts/default.html.erb index f36a0f833..97174b523 100644 --- a/app/views/layouts/default.html.erb +++ b/app/views/layouts/default.html.erb @@ -51,12 +51,12 @@

<%= link_to Danbooru.config.app_name, root_path, id: "app-name-header", class: "heading" %> - +
- +