From 117b17e25eb784657e9d2f3179ad770304545be9 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Sun, 13 Nov 2016 16:08:19 +0100 Subject: [PATCH] Remove unused conversations modal fixture closes #7129 --- Changelog.md | 1 + spec/controllers/jasmine_fixtures/conversations_spec.rb | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Changelog.md b/Changelog.md index 229fc8d47..5219d1865 100644 --- a/Changelog.md +++ b/Changelog.md @@ -10,6 +10,7 @@ * Show spinner when loading comments in the stream [#7170](https://github.com/diaspora/diaspora/pull/7170) * Add a dark color theme [#7152](https://github.com/diaspora/diaspora/pull/7152) * Added setting for custom changelog URL [#7166](https://github.com/diaspora/diaspora/pull/7166) +* Show more information of recipients on conversation creation [#7129](https://github.com/diaspora/diaspora/pull/7129) # 0.6.1.0 diff --git a/spec/controllers/jasmine_fixtures/conversations_spec.rb b/spec/controllers/jasmine_fixtures/conversations_spec.rb index ac74bb7f8..c07360d69 100644 --- a/spec/controllers/jasmine_fixtures/conversations_spec.rb +++ b/spec/controllers/jasmine_fixtures/conversations_spec.rb @@ -29,9 +29,6 @@ describe ConversationsController, :type => :controller do get :index, :conversation_id => @conv1.id save_fixture(html_for("body"), "conversations_read") - - get :new, modal: true - save_fixture(response.body, "conversations_modal") end end