From cc56f2230a10c4fded80a34e5297fad8d9891e02 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Tue, 31 Jul 2018 18:59:34 +0200 Subject: Add separate setting for sidebar text (site_short_description) (#8107) * Add separate setting for sidebar text (site_short_description) * Fix tests --- app/controllers/admin/settings_controller.rb | 1 + 1 file changed, 1 insertion(+) (limited to 'app/controllers') 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 -- cgit From 4da03a298a20e5007718764483544593556a5ed4 Mon Sep 17 00:00:00 2001 From: Yamagishi Kazutoshi Date: Thu, 2 Aug 2018 00:57:02 +0900 Subject: Do not show pinned toots when min_id is set (#8111) --- app/controllers/accounts_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/controllers') diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb index d63363156..86e3b6e47 100644 --- a/app/controllers/accounts_controller.rb +++ b/app/controllers/accounts_controller.rb @@ -51,7 +51,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 -- cgit