Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-03-09 00:17:17 +00:00
parent 43a9a781a4 ff44b2e92d
commit 447d7e6127
206 changed files with 2401 additions and 737 deletions
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -35,7 +35,8 @@ class HomeController < ApplicationController
      end
    end

-    redirect_to(default_redirect_path)
+    matches = request.path.match(%r{\A/web/timelines/tag/(?<tag>.+)\z})
+    redirect_to(matches ? tag_path(CGI.unescape(matches[:tag])) : default_redirect_path)
  end

  def set_pack