--- /dev/null
+++ b/app/controllers/activities_controller.rb
@@ -0,0 +1,17 @@
+class ActivitiesController < ApplicationController
+
+  before_filter :find_project
+  
+  def index
+    @title, @url_suffix = Project.tab_settings(PRJ_TAB_ACTIVITIES)
+    @members = Member.find_by_project_alpha(@project.id)
+    if @is_member
+      @messages = Message.find_by_project_user(@project.id, current_user.id, 40)
+    else
+      @messages = Message.find_by_project(@project.id, 40)
+    end
+    render :action => "ac_index"
+  end
+
+
+end

--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -103,17 +103,6 @@ class ProjectsController < ApplicationController
     render :action => "ac_forum"
   end
 
-  def activity
-    @title, @url_suffix = Project.tab_settings(PRJ_TAB_ACTIVITY)
-    @members = Member.find_by_project_alpha(@project.id)
-    if @is_member
-      @messages = Message.find_by_project_user(@project.id, current_user.id, 40)
-    else
-      @messages = Message.find_by_project(@project.id, 40)
-    end
-    render :action => "ac_activity_index"
-  end
-
   def roadmap
     @title, @url_suffix = Project.tab_settings(PRJ_TAB_ROADMAP)
     render :action => "ac_roadmap"

--- /dev/null
+++ b/app/helpers/activities_helper.rb
@@ -0,0 +1,5 @@
+module ActivitiesHelper
+
+  include ProjectsHelper
+
+end

--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -53,7 +53,7 @@ module ProjectsHelper
     out << "<ul id='tabmenu'>"
     out << project_tab(active_tab, PRJ_TAB_WIKI)
     out << project_tab(active_tab, PRJ_TAB_REPOS)
-    out << project_tab(active_tab, PRJ_TAB_ACTIVITY)
+    out << project_tab(active_tab, PRJ_TAB_ACTIVITIES)
     out << project_tab(active_tab, PRJ_TAB_ROADMAP)
     out << project_tab(active_tab, PRJ_TAB_TICKETS)
     out << project_tab(active_tab, PRJ_TAB_ARTICLES)
@@ -100,7 +100,7 @@ module ProjectsHelper
       end
       out << render_right_project_extrainfo
       out << render_right_project_contributors
-    when PRJ_TAB_ACTIVITY
+    when PRJ_TAB_ACTIVITIES
       out << actionbox_basic(:allow_shortcuts => true)
       out << render(:partial => "ac_right_actionbox_post_message") if @is_member
     when PRJ_TAB_REPOS

--- a/app/helpers/wikis_helper.rb
+++ b/app/helpers/wikis_helper.rb
@@ -1,6 +1,5 @@
 module WikisHelper
 
-  # Gitlab
   include ProjectsHelper #if $application_mode == MODE_GITLAB
   include BlueclothHelper
   

--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -222,7 +222,7 @@ class Project < ActiveRecord::Base
     def self.list_for_user(user)
       if user != nil then
         list = ""
-        projects = Member.find_by_user(user.id)
+        projects = Member.find_by_user(user)
         if projects.size > 0 then
           start = true
           for project in projects
@@ -247,9 +247,9 @@ class Project < ActiveRecord::Base
       when PRJ_TAB_WIKI
         title = "Wiki"
         url_suffix = ""
-      when PRJ_TAB_ACTIVITY
+      when PRJ_TAB_ACTIVITIES
         title = "Activity"
-        url_suffix = "/activity"
+        url_suffix = "/activities"
       when PRJ_TAB_REPOS
         title = "Repositories"
         url_suffix = "/repos"

--- /dev/null
+++ b/app/views/activities/_ac_right_actionbox_post_message.html.erb
@@ -0,0 +1,14 @@
+<% form_for :message, :url => root_path, :html => {:method => :put, :name => 'postmessage', :id => 'input'} do |f| -%>
+
+  <h2>Post Message</h2>
+
+  <p>Add your current activity:</p>
+
+  <%= f.text_area(:activity, :rows => 4) -%>
+  
+  <p>
+    <a href="javascript:document.postmessage.submit();" class='function'>Update</a>
+  </p>
+
+  
+<% end -%>

--- /dev/null
+++ b/app/views/activities/ac_index.html.erb
@@ -0,0 +1,34 @@
+<%= render :partial => "projects/ac_project_header", :locals => { :tab => PRJ_TAB_ACTIVITIES,
+                                                                  :subtab => PRJ_TAB_SUBTAB_NONE,
+                                                                  :project => @project,
+                                                                  :pagetitle => @title } %>
+
+<% if @is_member && @members.size > 1 %>
+<div id='projectmembers'>
+<ul>
+<% @members.each do |m| %>
+  <% if m.user != current_user %>
+  <li><%= m.user.fullname %></li>
+  <% end %>
+<% end %>
+</ul>
+</div>
+<% end %>
+  
+<%= div_formattedtext_open %>
+
+<ul>
+<% @messages.each do |m| %>
+  <li>
+  <% unless @is_member %>
+  <strong><%= m.user.fullname %></strong>
+  <% end %>
+  <%= m.activity %>
+  <small>(<%= time_ago_in_words(m.created_at) %>)</small>
+  </li>
+<% end %>
+</ul>
+
+<%= div_formattedtext_close %>
+
+<%= render :partial => "projects/ac_project_footer" %>

--- a/app/views/projects/_ac_right_actionbox_post_message.html.erb
+++ /dev/null
@@ -1,14 +0,0 @@
-<% form_for :message, :url => root_path, :html => {:method => :put, :name => 'postmessage', :id => 'input'} do |f| -%>
-
-  <h2>Post Message</h2>
-
-  <p>Add your current activity:</p>
-
-  <%= f.text_area(:activity, :rows => 4) -%>
-  
-  <p>
-    <a href="javascript:document.postmessage.submit();" class='function'>Update</a>
-  </p>
-
-  
-<% end -%>

--- a/app/views/projects/ac_activity_index.html.erb
+++ /dev/null
@@ -1,34 +0,0 @@
-<%= render :partial => "ac_project_header", :locals => { :tab => PRJ_TAB_ACTIVITY,
-                                                         :subtab => PRJ_TAB_SUBTAB_NONE,
-                                                         :project => @project,
-                                                         :pagetitle => @title } %>
-
-<% if @is_member && @members.size > 1 %>
-<div id='projectmembers'>
-<ul>
-<% @members.each do |m| %>
-  <% if m.user != current_user %>
-  <li><%= m.user.fullname %></li>
-  <% end %>
-<% end %>
-</ul>
-</div>
-<% end %>
-  
-<%= div_formattedtext_open %>
-
-<ul>
-<% @messages.each do |m| %>
-  <li>
-  <% unless @is_member %>
-  <strong><%= m.user.fullname %></strong>
-  <% end %>
-  <%= m.activity %>
-  <small>(<%= time_ago_in_words(m.created_at) %>)</small>
-  </li>
-<% end %>
-</ul>
-
-<%= div_formattedtext_close %>
-
-<%= render :partial => "ac_project_footer" %>

--- a/config/initializers/gitlab_config.rb
+++ b/config/initializers/gitlab_config.rb
@@ -19,15 +19,14 @@ STYLE_NORIGHTCOLUMN = 2
 
 # Tabs for project page
 PRJ_TAB_WIKI = 1
-PRJ_TAB_ACTIVITY = 2
+PRJ_TAB_ACTIVITIES = 2
 PRJ_TAB_REPOS = 3
 PRJ_TAB_ROADMAP = 4
 PRJ_TAB_TICKETS = 5
 PRJ_TAB_ARTICLES = 6
 PRJ_TAB_FORUM = 7
-PRJ_TAB_ACTIVITY = 8
-PRJ_TAB_LOG = 9
-PRJ_TAB_CONFIG = 10
+PRJ_TAB_LOG = 8
+PRJ_TAB_CONFIG = 9
 
 PRJ_TAB_SUBTAB_NONE = 0
 

--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,22 +1,5 @@
 ActionController::Routing::Routes.draw do |map|
 
-  # The priority is based upon order of creation: first created -> highest priority.
-  
-  # Sample of regular route:
-  # map.connect 'products/:id', :controller => 'catalog', :action => 'view'
-  # Keep in mind you can assign values other than :controller and :action
-
-  # Sample of named route:
-  # map.purchase 'products/:id/purchase', :controller => 'catalog', :action => 'purchase'
-  # This route can be invoked with purchase_url(:id => product.id)
-
-  # You can have the root of your site routed by hooking up '' 
-  # -- just remember to delete public/index.html.
-  # map.connect '', :controller => "welcome"
-
-  # Allow downloading Web Service WSDL as a file with an extension
-  # instead of a file named 'wsdl'
-  #map.connect ':controller/service.wsdl', :action => 'wsdl'
   VALID_SHA = /[a-zA-Z0-9~\{\}\^\.\-_]+/
   map.root :controller => "site", :action => "index"
   
@@ -36,7 +19,6 @@ ActionController::Routing::Routes.draw do |map|
   #TODO Note the extra members :repository for Gitlab tabs (should these be added to a function that checks $application_mode?)
   map.resources :projects, :member => {:confirm_delete => :get,
                                        :forum => :get,
-                                       :activity => :get,
                                        :roadmap => :get,
                                        :log => :get,
                                        :config => :get
@@ -66,10 +48,10 @@ ActionController::Routing::Routes.draw do |map|
       end
       #FIXME these maybe should be down a level
       projects.resources(:articles)
+      projects.resources(:activities)
       projects.resources(:wikis)
       projects.resources(:milestones)
       projects.resources(:tickets)
-      #projects.resources(:events)
       #projects.resources(:members)
     end
     #projects.resource :respository
@@ -86,9 +68,6 @@ ActionController::Routing::Routes.draw do |map|
   map.about "about", :controller => "site", :action => "about"
   map.faq "about/faq", :controller => "site", :action => "faq"
 
-  #
-  # Gitlab specific routes
-  #
   map.resources :articles, :has_many => [:comments], :has_one => [:category, :project]
   #map.articles 'archives', :controller => 'articles', :action => 'index'
   # Date based archive article links
@@ -117,4 +96,6 @@ ActionController::Routing::Routes.draw do |map|
   # Install the default route as the lowest priority.
   map.connect ':controller/:action/:id.:format'
   map.connect ':controller/:action/:id'
+
 end
+

--- /dev/null
+++ b/test/functional/activities_controller_test.rb
@@ -0,0 +1,8 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class ActivitiesControllerTest < ActionController::TestCase
+  # Replace this with your real tests.
+  def test_truth
+    assert true
+  end
+end