--- a/README-APPCAST.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-
-Gitlab (GPL licensed same as Gitorious)
-23rd March 2008
-
-Gitlab is a team repo with a blog, ticketing, forum, wiki etc. that I'm
-merging in to Gitorious - basically a site for a team to host a set of
-private/public projects and manage them. It is for a known set of projects
-but I'll try to make it as general as possible. It's quite a tangent from
-Gitorious so I don't expect any of it to get merged up.
-
-It was simpler to merge Gitlab in than rip the Git code I needed out of
-Gitorious (I found the project via Grit).
-
-Initally I'm merging in without removing (if possible) Gitorious code, there
-is an application_mode set in the config yml that can be tested, if it's
-MODE_GITLAB then the rendering changes etc., setting MODE_GITORIOUS should
-render the existing Gitorious app. I've mainly done this so I can (hopefully)
-pull future Gitorious changes safely.
-
-Notes:
-
-- model and views with fixtures will be first stage, controllers and other
-  logic will be added when m/v finalised, some fixtures included for
-  development
-
-- the style for Gitlab has only been tested on FF2
-
-==
-mtkd (mtkd@prj2.com)
-
-
-

--- /dev/null
+++ b/README-GITLAB.txt
@@ -0,0 +1,32 @@
+
+Gitlab (GPL licensed same as Gitorious)
+23rd March 2008
+
+Gitlab is a team repo with a blog, ticketing, forum, wiki etc. that I'm
+merging in to Gitorious - basically a site for a team to host a set of
+private/public projects and manage them. It is for a known set of projects
+but I'll try to make it as general as possible. It's quite a tangent from
+Gitorious so I don't expect any of it to get merged up.
+
+It was simpler to merge Gitlab in than rip the Git code I needed out of
+Gitorious (I found the project via Grit).
+
+Initally I'm merging in without removing (if possible) Gitorious code, there
+is an application_mode set in the config yml that can be tested, if it's
+MODE_GITLAB then the rendering changes etc., setting MODE_GITORIOUS should
+render the existing Gitorious app. I've mainly done this so I can (hopefully)
+pull future Gitorious changes safely.
+
+Notes:
+
+- model and views with fixtures will be first stage, controllers and other
+  logic will be added when m/v finalised, some fixtures included for
+  development
+
+- the style for Gitlab has only been tested on FF2
+
+==
+mtkd (mtkd@prj2.com)
+
+
+

--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -18,8 +18,8 @@ class ProjectsController < ApplicationController
     when MODE_GITLAB
       @title = "Projects"
       @public_projects = Project.find_all_active_public_projects(current_user)
-      flash[:error] = "No public projects exist." if @public_projects.size == 0
-      @member_projects = Project.find_all_active_member_projects(current_user.id) if logged_in?
+      #flash[:error] = "No public projects exist." if @public_projects.size == 0
+      @member_projects = Project.find_all_active_member_projects(current_user) if logged_in?
       render :action => "ac_list"
     end
   end

--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -54,6 +54,7 @@ module ProjectsHelper
     out << project_tab(active_tab, PRJ_TAB_WIKI)
     out << project_tab(active_tab, PRJ_TAB_EVENTS)
     out << project_tab(active_tab, PRJ_TAB_REPOS)
+    out << project_tab(active_tab, PRJ_TAB_MEMBERS)
     out << project_tab(active_tab, PRJ_TAB_ROADMAP)
     out << project_tab(active_tab, PRJ_TAB_TICKETS)
     out << project_tab(active_tab, PRJ_TAB_ARTICLES)
@@ -99,7 +100,7 @@ module ProjectsHelper
       end
       out << render_right_project_extrainfo
       out << render_right_project_contributors
-    when PRJ_TAB_ACTIVITY
+    when PRJ_TAB_MEMBERS
       out << actionbox_basic(:allow_shortcuts => true)
     when PRJ_TAB_REPOS
       case subtab

--- /dev/null
+++ b/app/models/article.rb
@@ -0,0 +1,187 @@
+class Article < ActiveRecord::Base
+
+  belongs_to :user
+  belongs_to :category
+  belongs_to :project
+  
+  has_many :comments
+  
+  #
+  validates_columns :article_type, :status, :comment_status, :audience
+  validates_presence_of :title, :permalink, :category_id, :user_id
+  validates_length_of :title, :within => 2..128
+  validates_length_of :permalink, :within => 2..128
+  validates_uniqueness_of :title, :permalink, :case_sensitive => false
+
+  # must pass the enum as string
+  def self.format_article_type (at)
+    case at
+    when "release"
+      return "Releases"
+    when "issue"
+      return "Issues"
+    when "howto"
+      return "How To" #TODO this is spare now
+    when "other"
+      return "Others"
+    else
+      return at.to_s.capitalize
+    end
+  end  
+ 
+protected
+
+  
+  #FIXME it's possible this could be returning too many results
+  def self.time_delta(year, month = nil, day = nil)
+    from = Time.mktime(year, month || 1, day || 1)
+    to = from + 1.year
+    to = from + 1.month unless month.blank?    
+    to = from + 1.day unless day.blank?
+    to = to.tomorrow unless month.blank?
+    return [from, to]
+  end
+
+  #FIXME Audience Issue
+  #there is some conflict between the security system using project audience and articles
+  #poss solution is either to do enforce that articles can't be public if they belong to a private project
+  #or to do the security tests below by joining project and testing project.audience as well as testing
+  #article.audience
+
+  
+  #public version of .count to filter articles you are not authorised to see
+  def self.public_count (curruser)
+    @projects = Project.list_for_user(curruser)
+    #FIXME is there a faster way of doing this?
+    @articles = find(:all, :conditions => ["status = '#{:published}' AND ( audience = '#{:public}' OR project_id IN (" << @projects << ") )"], :order => "created_at DESC")
+    return @articles.size
+  end
+ 
+  #
+  # finds articles for \2008 or \2008\11 or \2008\11\1
+  #
+  def self.find_by_date (curruser, year, month = nil, day = nil)
+    from, to = self.time_delta(year, month, day)
+    @projects = Project.list_for_user(curruser)
+    find(:all, :conditions => [ "status = '#{:published}' AND (created_at BETWEEN ? AND ?) AND ( audience = '#{:public}' OR project_id IN (" << @projects << ") )", from, to ])
+  end
+
+  #
+  def self.find_all_articles (curruser)
+    @projects = Project.list_for_user(curruser)
+    find(:all, :conditions => ["status = '#{:published}' AND ( audience = '#{:public}' OR project_id IN (" << @projects << ") )"], :order => "created_at DESC")
+  end
+
+  #
+  def self.find_home (curruser)
+    @projects = Project.list_for_user(curruser)
+    find(:all, :conditions => ["status = '#{:published}' AND ( audience = '#{:public}' OR project_id IN (" << @projects << ") )"], :order => "created_at DESC", :limit => 3)
+  end
+  
+  # finds articles for a user based on the user slug e.g. /profiles/test-user/articles
+  def self.find_by_user (user_id, curruser)
+    @projects = Project.list_for_user(curruser)
+    find(:all, :conditions => ["status = '#{:published}' AND user_id = '#{user_id}' AND ( audience = '#{:public}' OR project_id IN (" << @projects << ") )"], :order => "created_at DESC")
+  end
+
+  # finds articles for a user/project based on the user slug e.g. /profiles/test-user/project/project_id/articles
+  def self.find_by_user_project (user_id, project_id, curruser)
+    @projects = Project.list_for_user(curruser)
+    find(:all, :conditions => ["status = '#{:published}' AND user_id = '#{user_id}' AND project_id = '#{project_id}' AND ( audience = '#{:public}' OR project_id IN (" << @projects << ") )"], :order => "created_at DESC")
+  end
+  
+  #
+  def self.find_by_permalink (permalink, curruser)
+    @projects = Project.list_for_user(curruser)
+    find(:first, :conditions => ["status = '#{:published}' AND permalink = '#{permalink}' AND ( audience = '#{:public}' OR project_id IN (" << @projects << ") )"])
+  end
+  
+  #
+  def self.find_by_type (article_type, curruser)
+    @projects = Project.list_for_user(curruser)
+    find(:all, :conditions => ["status = '#{:published}' AND article_type = '#{article_type}' AND ( audience = '#{:public}' OR project_id IN (" << @projects << ") )"], :order => "created_at DESC")
+  end
+  
+  #
+  def self.find_by_category (category_id, curruser)
+    @projects = Project.list_for_user(curruser)
+    find(:all, :conditions => ["status = '#{:published}' AND category_id = '#{category_id}' AND ( audience = '#{:public}' OR project_id IN (" << @projects << ") )"], :order => "created_at DESC")
+  end
+
+  #
+  def self.find_by_sitename
+    find(:all, :conditions => ["status = '#{:published}' AND project_id = '1'"], :order => "created_at DESC")
+  end
+  
+  #
+  def self.find_by_project (project_id, curruser)
+    projects_allowed = Project.list_for_user(curruser)
+    find(:all, :conditions => ["status = '#{:published}' AND project_id = '#{project_id}' AND ( audience = '#{:public}' OR project_id IN (" << projects_allowed << ") )"], :order => "created_at DESC")
+  end
+
+  #
+  def self.find_by_sitename_and_type (article_type)
+    find(:all, :conditions => ["status = '#{:published}' AND project_id = '1' AND article_type = '#{article_type}'"], :order => "created_at DESC")
+  end
+
+  #
+  def self.find_by_project_and_type (article_type, project_id, curruser)
+    projects_allowed = Project.list_for_user(curruser)
+    find(:all, :conditions => ["status = '#{:published}' AND project_id = '#{project_id}' AND article_type = '#{article_type}' AND ( audience = '#{:public}' OR project_id IN (" << projects_allowed << ") )"], :order => "created_at DESC")
+  end
+
+  #
+  def self.find_sitename_type_counts
+    find_by_sql ["SELECT article_types.article_type, IFNULL(COUNT(articles.id),0) AS type_count
+                  FROM article_types
+                  LEFT JOIN articles ON article_types.article_type = articles.article_type AND (articles.project_id = 1 AND articles.status = '#{:published}')
+                  GROUP BY article_types.article_type
+                  ORDER BY article_types.id"]
+  end
+  
+  #
+  def self.find_project_type_counts (project_id)
+    find_by_sql ["SELECT article_types.article_type, IFNULL(COUNT(articles.id),0) AS type_count
+                  FROM article_types
+                  LEFT JOIN articles ON article_types.article_type = articles.article_type AND (articles.project_id = '#{project_id}' AND articles.status = '#{:published}')
+                  GROUP BY article_types.article_type
+                  ORDER BY article_types.id"]
+  end
+  
+  # only show public articles on the main feed
+  # FIXME do a seperate feed on the private user page with project member articles included
+  def self.find_rss
+    find(:all, :conditions => ["status = '#{:published}' AND audience = '#{:public}'"], :order => "created_at DESC", :limit => 10)
+  end
+
+  #
+  def self.admin_find_all_articles
+    find(:all, :order => "created_at DESC")
+  end
+
+  # finds articles for a user based on the user slug e.g. /profiles/test-user/articles
+  def self.admin_find_by_user (user_id)
+    find(:all, :conditions => ["user_id = '#{user_id}'"], :order => "created_at DESC")
+  end
+
+  #
+  def self.admin_find_by_category(category_id)
+    find(:all, :conditions => ["category_id = '#{category_id}'"], :order => "created_at DESC")
+  end
+
+  #
+  def self.admin_find_by_search(phrase)
+    find(:all, :conditions => ["title like ?", "%" << phrase << "%"], :order => "created_at DESC")
+  end
+
+end
+
+
+
+
+ 
+ 
+ 
+ 
+ 
+ 
\ No newline at end of file

--- /dev/null
+++ b/app/models/category.rb
@@ -0,0 +1,32 @@
+class Category < ActiveRecord::Base
+
+  belongs_to :user
+
+  has_many :articles
+
+  
+  protected
+  
+    #
+    def self.find_by_all
+      find(:all, :order => 'parent ASC, id ASC')
+    end
+
+    #
+    def self.find_by_all_with_count (curruser)
+      @projects = Project.list_for_user(curruser)
+      find_by_sql ["SELECT categories.name, category_type, categories.slug, COUNT(articles.id) AS num_articles FROM categories JOIN articles ON categories.id = articles.category_id WHERE articles.status = '#{:published}' AND (articles.audience = '#{:public}' OR articles.project_id IN (" << @projects << ") ) GROUP BY articles.category_id ORDER BY parent ASC, categories.name"]
+    end
+
+    #
+    def self.find_by_slug(slug)
+      find(:first, :conditions => ["slug = '#{slug}'"])
+    end
+
+    #
+    def self.find_by_search(phrase)
+      #find(:all, :conditions => ["status = '#{:published}' AND title like ?", "%" << phrase << "%"])
+    end
+      
+
+end

--- a/app/models/committership.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-class Committership < ActiveRecord::Base
-  belongs_to :user
-  belongs_to :repository
-  
-  KIND_ACCESS_NONE  = 0
-  KIND_ACCESS_READ  = 1
-  KIND_ACCESS_WRITE = 2
-end

--- /dev/null
+++ b/app/models/event/event.rb
@@ -0,0 +1,9 @@
+class Event < ActiveRecord::Base
+
+  protected
+  
+    def self.find_by_project(project_id)
+      find(:all, :conditions => ["project_id = '#{project_id}'"], :order => "created_at DESC")
+    end
+  
+end

--- /dev/null
+++ b/app/models/git/committership.rb
@@ -0,0 +1,8 @@
+class Committership < ActiveRecord::Base
+  belongs_to :user
+  belongs_to :repository
+  
+  KIND_ACCESS_NONE  = 0
+  KIND_ACCESS_READ  = 1
+  KIND_ACCESS_WRITE = 2
+end

--- /dev/null
+++ b/app/models/git/merge_request.rb
@@ -0,0 +1,67 @@
+class MergeRequest < ActiveRecord::Base
+  belongs_to :user
+  belongs_to :source_repository, :class_name => 'Repository'
+  belongs_to :target_repository, :class_name => 'Repository'
+  
+  is_indexed :fields => ["proposal"], :include => [{
+      :association_name => "user",
+      :field => "login",
+      :as => "proposed_by"
+    }], :conditions => "status = 0"
+  
+  attr_protected :user_id, :status
+    
+  validates_presence_of :user, :source_repository, :target_repository
+  
+  STATUS_OPEN = 0
+  STATUS_MERGED = 1
+  STATUS_REJECTED = 2
+  
+  def self.statuses
+    { "Open" => STATUS_OPEN, "Merged" => STATUS_MERGED, "Rejected" => STATUS_REJECTED }
+  end
+  
+  def self.count_open
+    count(:all, :conditions => {:status => STATUS_OPEN})
+  end
+  
+  def status_string
+    self.class.statuses.invert[status].downcase
+  end
+  
+  def open?
+    status == STATUS_OPEN
+  end
+  
+  def merged?
+    status == STATUS_MERGED
+  end
+  
+  def rejected?
+    status == STATUS_REJECTED
+  end
+  
+  def source_branch
+    super || "master"
+  end
+  
+  def target_branch
+    super || "master"
+  end
+  
+  def source_name
+    if source_repository
+      "#{source_repository.name}:#{source_branch}"
+    end
+  end
+  
+  def target_name
+    if target_repository
+      "#{target_repository.name}:#{target_branch}"
+    end
+  end
+  
+  def resolvable_by?(candidate)
+    candidate == target_repository.user
+  end
+end

--- /dev/null
+++ b/app/models/git/merge_request_observer.rb
@@ -0,0 +1,7 @@
+class MergeRequestObserver < ActiveRecord::Observer
+  
+  def after_create(record)
+    Mailer.deliver_merge_request_notification(record)
+  end
+  
+end
\ No newline at end of file