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

Conflicts:
	README.md
	app/controllers/statuses_controller.rb
	app/lib/feed_manager.rb
	config/navigation.rb
	spec/lib/feed_manager_spec.rb

Conflicts were resolved by taking both versions for each change.
This means the two filter systems (glitch-soc's keyword mutes and tootsuite's
custom filters) are in place, which will be changed in a follow-up commit.

app/javascript/mastodon/locales/defaultMessages.json

@@ -334,6 +334,10 @@
   },
   {
     "descriptors": [
+      {
+        "defaultMessage": "Filtered",
+        "id": "status.filtered"
+      },
       {
         "defaultMessage": "Pinned toot",
         "id": "status.pinned"
@@ -632,21 +636,9 @@
   },
   {
     "descriptors": [
-      {
-        "defaultMessage": "Filter out by regular expressions",
-        "id": "home.column_settings.filter_regex"
-      },
-      {
-        "defaultMessage": "Column settings",
-        "id": "home.settings"
-      },
       {
         "defaultMessage": "Media Only",
         "id": "community.column_settings.media_only"
-      },
-      {
-        "defaultMessage": "Advanced",
-        "id": "home.column_settings.advanced"
       }
     ],
     "path": "app/javascript/mastodon/features/community_timeline/components/column_settings.json"
@@ -1019,23 +1011,6 @@
     ],
     "path": "app/javascript/mastodon/features/compose/index.json"
   },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Filter out by regular expressions",
-        "id": "home.column_settings.filter_regex"
-      },
-      {
-        "defaultMessage": "Column settings",
-        "id": "home.settings"
-      },
-      {
-        "defaultMessage": "Advanced",
-        "id": "home.column_settings.advanced"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/direct_timeline/components/column_settings.json"
-  },
   {
     "descriptors": [
       {
@@ -1221,14 +1196,6 @@
   },
   {
     "descriptors": [
-      {
-        "defaultMessage": "Filter out by regular expressions",
-        "id": "home.column_settings.filter_regex"
-      },
-      {
-        "defaultMessage": "Column settings",
-        "id": "home.settings"
-      },
       {
         "defaultMessage": "Basic",
         "id": "home.column_settings.basic"
@@ -1240,10 +1207,6 @@
       {
         "defaultMessage": "Show replies",
         "id": "home.column_settings.show_replies"
-      },
-      {
-        "defaultMessage": "Advanced",
-        "id": "home.column_settings.advanced"
       }
     ],
     "path": "app/javascript/mastodon/features/home_timeline/components/column_settings.json"
@@ -1947,10 +1910,6 @@
         "defaultMessage": "Notifications",
         "id": "tabs_bar.notifications"
       },
-      {
-        "defaultMessage": "Search",
-        "id": "tabs_bar.search"
-      },
       {
         "defaultMessage": "Local",
         "id": "tabs_bar.local_timeline"
@@ -1958,6 +1917,10 @@
       {
         "defaultMessage": "Federated",
         "id": "tabs_bar.federated_timeline"
+      },
+      {
+        "defaultMessage": "Search",
+        "id": "tabs_bar.search"
       }
     ],
     "path": "app/javascript/mastodon/features/ui/components/tabs_bar.json"