about summary refs log tree commit diff
path: root/app/views
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2020-02-25 14:28:13 +0100
committerThibaut Girka <thib@sitedethib.com>2020-02-25 14:28:13 +0100
commit85933bc9ff5869e69403315a30c3027d59c7e60d (patch)
treeea2bab292d7fdc97f529aa447300017c4ede00af /app/views
parent0d41fef50618e3d58255b4f4082326e83ff06982 (diff)
parent7face973fa1c7d6c18b06d427ea0b7a741d11466 (diff)
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'app/views')
-rw-r--r--app/views/authorize_interactions/show.html.haml6
1 files changed, 6 insertions, 0 deletions
diff --git a/app/views/authorize_interactions/show.html.haml b/app/views/authorize_interactions/show.html.haml
index 7ca9b98c1..42c874134 100644
--- a/app/views/authorize_interactions/show.html.haml
+++ b/app/views/authorize_interactions/show.html.haml
@@ -11,6 +11,12 @@
         = 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
       = hidden_field_tag :action, :follow