Merge branch 'master' into glitch-soc/merge-upstream

Conflicts: config/settings.yml
2018-08-01 22:20:25 +02:00
parent 71b318dedc 4da03a298a
commit bf1d3ae3b8
11 changed files with 16 additions and 6 deletions
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@ -52,7 +52,7 @@ class AccountsController < ApplicationController
  private

  def show_pinned_statuses?
-    [replies_requested?, media_requested?, params[:max_id].present?, params[:since_id].present?].none?
+    [replies_requested?, media_requested?, params[:max_id].present?, params[:min_id].present?].none?
  end

  def filtered_statuses
--- a/app/controllers/admin/settings_controller.rb
+++ b/app/controllers/admin/settings_controller.rb
@ -6,6 +6,7 @@ module Admin
      site_contact_username
      site_contact_email
      site_title
+      site_short_description
      site_description
      site_extended_description
      site_terms