From 8b3943e8c42bfee886a64ffca2d53f4acbeb8010 Mon Sep 17 00:00:00 2001
From: Hagen Schink <h.schink@finn.de>
Date: Thu, 31 Oct 2013 11:11:14 +0100
Subject: [PATCH 1/2] Adds spec

---
 .../controllers/activities_controller_spec.rb | 31 ++++++++++++++++---
 1 file changed, 26 insertions(+), 5 deletions(-)

diff --git a/spec/controllers/activities_controller_spec.rb b/spec/controllers/activities_controller_spec.rb
index f6f42fa03c..a1cb327f83 100644
--- a/spec/controllers/activities_controller_spec.rb
+++ b/spec/controllers/activities_controller_spec.rb
@@ -74,14 +74,35 @@ describe ActivitiesController do
       let!(:wp_2) { FactoryGirl.create(:work_package,
                                        project: project,
                                        author: user) }
-      let(:params) { { project_id: project.id,
-                       format: :atom } }
 
-      before { get :index, params }
+      context :work_package do
+        let(:params) { { project_id: project.id,
+                         format: :atom } }
 
-      it { expect(assigns(:items).count).to eq(2) }
+        before { get :index, params }
 
-      it { expect(response).to render_template("common/feed") }
+        it { expect(assigns(:items).count).to eq(2) }
+
+        it { expect(response).to render_template("common/feed") }
+      end
+
+      context :boards do
+        let(:board) { FactoryGirl.create(:board,
+                                         project: project) }
+        let!(:message_1) { FactoryGirl.create(:message,
+                                              board: board) }
+        let!(:message_2) { FactoryGirl.create(:message,
+                                              board: board) }
+        let(:params) { { project_id: project.id,
+                         show_messages: 1,
+                         format: :atom } }
+
+        before { get :index, params }
+
+        it { expect(assigns(:items).count).to eq(2) }
+
+        it { expect(response).to render_template("common/feed") }
+      end
     end
   end
 end

From caa2dc112dc1c3f711b0492ceb97fdf31b31fcb0 Mon Sep 17 00:00:00 2001
From: Hagen Schink <h.schink@finn.de>
Date: Thu, 31 Oct 2013 11:13:08 +0100
Subject: [PATCH 2/2] Adds changelog entry

---
 doc/CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/CHANGELOG.md b/doc/CHANGELOG.md
index efab0270dd..35244a176f 100644
--- a/doc/CHANGELOG.md
+++ b/doc/CHANGELOG.md
@@ -32,6 +32,8 @@ See doc/COPYRIGHT.rdoc for more details.
 * `#2593` Work Package Summary missing
 * `#1749` Prevent JSON Hijacking
 * `#2281` The context menu is not correctly displayed
+* `#2525` Project Settings: Forums: Move up/down result in 404
+* `#2535` [Forum] Atom feed on the forum's overview-page doesn't work
 * `#2348` [Timelines] Using planning element filter and filtering for status "New" leads always to plus-sign in front of work packages
 * `#2357` [Timelines] Change API v2 serialization to minimize redundant data
 * `#2363` When all wiki pages have been deleted new wiki pages cannot be created