about summary refs log tree commit diff
path: root/app/controllers
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2018-08-01 22:20:25 +0200
committerThibaut Girka <thib@sitedethib.com>2018-08-01 22:20:25 +0200
commitbf1d3ae3b83726816c78ca6cb40af24d48390bd9 (patch)
tree29c156a7d145f2ec88e4bb708d329202598bdf35 /app/controllers
parent71b318dedc5f39382cb15250417429427a69166b (diff)
parent4da03a298a20e5007718764483544593556a5ed4 (diff)
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	config/settings.yml
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/accounts_controller.rb2
-rw-r--r--app/controllers/admin/settings_controller.rb1
2 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
index 723da665e..35ee5cca9 100644
--- 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
diff --git a/app/controllers/admin/settings_controller.rb b/app/controllers/admin/settings_controller.rb
index 75d00326c..3234b194f 100644
--- 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