--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ nbproject/*
 log/*
 log/route.txt
 *.sh
+*/.LCK*

--- a/test/fixtures/article_bodies/_gitlab-rename-and-update.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-
-The project has been renamed to Gitlab (it's more meaningful and the domain was available), it will be hosted on the gitlab.org domain.
-
-I will probably fork the project from Gitorious this week and stop updating, as Gitorious is about to add Krawek's events changes which
-conflict with events in Gitlab (also I'm now using different comment and project membership models so it's getting harder
-to merge).
-
-Completed merging in Gitorious reposistory browser, source browser etc.
-Wiki CRUD is now complete and working, including syntax highlighting for most languages
-Added Journalling system that records a history of any model (e.g. ticket, wiki, article)
-Added user membership of projects
-
-
-Still to do
-
-Ticket, Forum model
-User dashboard
-Complete a lot of CRUD

--- /dev/null
+++ b/test/fixtures/article_bodies/_gitlab-renamed-and-forked.txt
@@ -0,0 +1,14 @@
+<p>The project has been renamed to Gitlab (it's more meaningful and the domain was available), it will be hosted on the <a href='http://www.itlab.org'>gitlab.org</a> domain.</p>
+
+<p>I will probably fork the project from Gitorious this week and stop updating. Gitorious is about to add Krawek's events changes which
+conflict with events in Gitlab (also I'm now using different comment and project membership models so it's getting harder
+to merge).</p>
+
+<ul>
+<li>Completed merging in Gitorious reposistory browser, source browser etc.</li>
+<li>Wiki CRUD is now complete and working, including syntax highlighting for most languages</li>
+<li>Added journalling system that records a change history of any model (e.g. ticket, wiki, article)</li>
+<li>Added user membership of projects</li>
+</ul>
+
+<p>Working now on the Ticket and Forum models, the User dashboard and completing a lot of the CRUD.</p>

--- a/test/fixtures/articles.yml
+++ b/test/fixtures/articles.yml
@@ -3,13 +3,27 @@
 #
 <% fixtures :users, :categories, :projects, :journals %>
 
+A005:
+  id: 5
+  title: "Renamed and forked"
+  body: "<%= File.open("#{RAILS_ROOT}/test/fixtures/article_bodies/_gitlab-renamed-and-forked.txt",'r').read %>"
+  body_summary: "<%= File.open("#{RAILS_ROOT}/test/fixtures/article_bodies/_gitlab-renamed-and-forked.txt",'r').read %>"
+  article_type: :news
+  permalink: "gitlab-rename-and-update"
+  user_id: <%= users(:mtkd) %>
+  project_id: <%= projects(:gitlab) %>
+  audience: :public
+  status: :published
+  comment_status: :open
+  category_id: <%= categories(:none) %>
+  created_at: "2008-04-28 05:52:00"
 
 A004:
   id: 4
   title: "Major Refactor / Gitorious Merge"
   body: "<%= File.open("#{RAILS_ROOT}/test/fixtures/article_bodies/_gitlab-major-refactor-gitorious-merge.txt",'r').read %>"
   body_summary: "<%= File.open("#{RAILS_ROOT}/test/fixtures/article_bodies/_gitlab-major-refactor-gitorious-merge-summary.txt",'r').read %>"
-  article_type: :code
+  article_type: :news
   permalink: "gitlab-major-refactor-gitorious-merge"
   user_id: <%= users(:mtkd) %>
   project_id: <%= projects(:gitlab) %>