Merge branch 'next-minor' into develop

Changelog.md

@@ -17,6 +17,7 @@
 * Fix fetching comments after fetching likes [#7167](https://github.com/diaspora/diaspora/pull/7167)
 * Hide 'reshare' button on already reshared posts [#7169](https://github.com/diaspora/diaspora/pull/7169)
 * Only reload profile header when changing aspect memberships [#7183](https://github.com/diaspora/diaspora/pull/7183)
+* Fix visiblity on invitation modal when opening it from the stream [#7191](https://github.com/diaspora/diaspora/pull/7191)
 
 ## Features
 * Show spinner when loading comments in the stream [#7170](https://github.com/diaspora/diaspora/pull/7170)

app/views/shared/_invitations.haml

@@ -3,6 +3,7 @@
 .invitations-link.btn.btn-link#invitations-button{"data-toggle" => "modal"}
   = t(".by_email")
 
+- content_for :after_content do
   = render "shared/modal",
       path: new_user_invitation_path,
       id: "invitationsModal",

features/desktop/invitations.feature

@@ -39,7 +39,7 @@ Feature: Invitations
     And I click on selector "#invitations-button"
     Then I should see one less invite
 
-  Scenario: sends an invitation
+  Scenario: sends an invitation from the sidebar
     When I sign in as "alice@alice.alice"
     And I click on "Invite your friends" navbar title
     And I click on selector "#invitations-button"
@@ -49,6 +49,15 @@ Feature: Invitations
     Then I should have 1 Devise email delivery
     And I should not see "change your notification settings" in the last sent email
 
+  Scenario: sends an invitation from the stream
+    When I sign in as "alice@alice.alice"
+    And I press the first "a.invitations-link" within "#no_contacts"
+    And I fill in the following:
+      | email_inviter_emails         | alex@example.com    |
+    And I press "Send an invitation"
+    Then I should have 1 Devise email delivery
+    And I should not see "change your notification settings" in the last sent email
+
   Scenario: sends an invitation from the people search page
     When I sign in as "alice@alice.alice"
     And I search for "test"