about summary refs log tree commit diff
path: root/app/views
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2020-02-25 18:05:52 +0100
committerGitHub <noreply@github.com>2020-02-25 18:05:52 +0100
commit9ee8e1add9f937a75c2514ca88958ff02cf5573c (patch)
treee6c97dfd5a14860b9c825b1c84fb1dd84ada6581 /app/views
parent0d41fef50618e3d58255b4f4082326e83ff06982 (diff)
parent2f2b48b227304d0f0a28dd4867e84af10b8097ad (diff)
Merge pull request #1289 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
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