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

2020-02-25 14:28:13 +01:00
parent 0d41fef506 7face973fa
commit 85933bc9ff
13 changed files with 76 additions and 61 deletions
--- a/app/views/authorize_interactions/show.html.haml
+++ b/app/views/authorize_interactions/show.html.haml
@@ -10,6 +10,12 @@
      %strong
        = t('authorize_follow.already_following')

+    = render 'post_follow_actions'
+  - elsif current_account.requested?(@resource)
+    .flash-message
+      %strong
+        = t('authorize_follow.already_requested')
+
    = render 'post_follow_actions'
  - else
    = form_tag authorize_interaction_path, method: :post, class: 'simple_form' do