--- a/app/controllers/browse_controller.rb
+++ b/app/controllers/browse_controller.rb
@@ -5,14 +5,9 @@ class BrowseController < ApplicationController
   LOGS_PER_PAGE = 30
   
   def index
-    @git = Git.bare(@repository.full_repository_path)
+    @git = Gitorious::Gitto.new(@repository.full_repository_path)
     @commits = @git.log(LOGS_PER_PAGE)
-    @tags_per_sha = returning({}) do |hash|
-      @git.tags.each do |tag| 
-        hash[tag.sha] ||= []
-        hash[tag.sha] << tag.name 
-      end
-    end
+    @tags_per_sha = @git.tags_by_sha
     # TODO: Patch rails to keep track of what it responds to so we can DRY this up
     @atom_auto_discovery_url = project_repository_formatted_browse_path(@project, @repository, :atom)
     respond_to do |format|
@@ -22,49 +17,44 @@ class BrowseController < ApplicationController
   end
   
   def tree
-    @git = Git.bare(@repository.full_repository_path)   
-    @tree = @git.gtree(params[:sha])
+    @git = Gitorious::Gitto.new(@repository.full_repository_path)   
+    @tree = @git.tree(params[:sha])
   end
   
   def commit
     @diffmode = params[:diffmode] == "sidebyside" ? "sidebyside" : "inline"
-    @git = Git.bare(@repository.full_repository_path)
-    @commit = @git.gcommit(params[:sha])
+    @git = Gitorious::Gitto.new(@repository.full_repository_path)
+    @commit = @git.commit(params[:sha])
     if @commit.parent
       @diff = @git.diff(@commit.parent.sha || "", @commit.sha)
     else
-      # initial commit
-      @diff = @commit.diff("") # fIXME: diffs are the wrong way
+      # initial commit, link to the initial tree instead
+      @diff = nil
     end
     @comment_count = @repository.comments.count(:all, :conditions => {:sha1 => @commit.sha})
   end
   
   def diff
-    @git = Git.bare(@repository.full_repository_path)
+    @git = Gitorious::Gitto.new(@repository.full_repository_path)
     @diff = @git.diff(params[:sha], params[:other_sha])
   end
   
   def blob
-    @git = Git.bare(@repository.full_repository_path)
-    @blob = @git.gblob(params[:sha])
+    @git = Gitorious::Gitto.new(@repository.full_repository_path)
+    @blob = @git.blob(params[:sha])
   end
   
   def raw
-    @git = Git.bare(@repository.full_repository_path)
-    @blob = @git.gblob(params[:sha])
+    @git = Gitorious::Gitto.new(@repository.full_repository_path)
+    @blob = @git.blob(params[:sha])
     render :text => @blob.contents, :content_type => "text/plain"
   end
   
   def log
-    @git = Git.bare(@repository.full_repository_path)
+    @git = Gitorious::Gitto.new(@repository.full_repository_path)
     skip = params[:page].blank? ? 0 : (params[:page].to_i-1) * LOGS_PER_PAGE
     @commits = @git.log(LOGS_PER_PAGE, skip)
-    @tags_per_sha = returning({}) do |hash|
-      @git.tags.each do |tag| 
-        hash[tag.sha] ||= []
-        hash[tag.sha] << tag.name 
-      end
-    end
+    @tags_per_sha = @git.tags_by_sha
     # TODO: Patch rails to keep track of what it responds to so we can DRY this up
     @atom_auto_discovery_url = project_repository_formatted_browse_path(@project, @repository, :atom)
     respond_to do |format|

--- a/app/controllers/comments_controller.rb
+++ b/app/controllers/comments_controller.rb
@@ -25,6 +25,7 @@ class CommentsController < ApplicationController
   def create
     @comment = @repository.comments.new(params[:comment])
     @comment.user = current_user
+    @comment.project = @project
     respond_to do |format|
       if @comment.save
         format.html do

--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -1,10 +1,26 @@
 class SiteController < ApplicationController
+  before_filter :login_required, :only => [:dashboard]
   
   def index
     @tags = Project.tag_counts
+    @projects = Project.find(:all, :limit => 5, :order => "id desc")
+  end
+  
+  def dashboard
+    @projects = current_user.projects
+    project_ids = @projects.map(&:id)
+    @recent_comments = Comment.find(:all, :limit => 10,
+      :conditions => ["comments.project_id in (?)", project_ids], 
+      :order => "comments.created_at desc", :include => [:user, :repository])
+    @repository_clones = @projects.map(&:repository_clones).flatten
+    # @repository_clones = Repository.find(:all, 
+    #   :conditions => ["project_id in (?) and mainline = ?", project_ids, false])
   end
   
   def about
   end
   
+  def faq    
+  end
+  
 end

--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -27,6 +27,8 @@ class UsersController < ApplicationController
         current_user.activate
         flash[:notice] = "Your account has been activated, welcome!"
       end
+    else
+      flash[:error] = "Invalid activation code"
     end
     redirect_back_or_default('/')
   end

--- a/app/helpers/browse_helper.rb
+++ b/app/helpers/browse_helper.rb
@@ -99,7 +99,7 @@ module BrowseHelper
   end
   
   def render_diffmode_selector
-    out = %Q{<ul class="diffmode_selector">}
+    out = %Q{<ul class="mode_selector">}
     out << %Q{<li class="list_header">Diff rendering mode:</li>}
     if @diffmode == "sidebyside"
       out << %Q{<li><a href="?diffmode=inline">inline</a></li>}
@@ -112,4 +112,20 @@ module BrowseHelper
     out
   end
   
+  def with_line_numbers(&block)
+    out = []
+    #yield.split("\n").each_with_index{ |s,i| out << "#{i+1}: #{s}" }
+    out << %Q{<table id="codeblob">}
+    yield.to_s.split("\n").each_with_index do |line, count|
+      lineno = count + 1
+      out << %Q{<tr id="line#{lineno}">}
+      out << %Q{<td class="line-numbers"><a href="#line#{lineno}" name="line#{lineno}">#{lineno}</a></td>} 
+      out << %Q{<td class="code">#{line}</td>}
+      out << "</tr>"
+    end
+    out << "</table>"
+    out.join("\n")
+    
+  end
+  
 end

--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -14,10 +14,11 @@
 class Comment < ActiveRecord::Base
   belongs_to :user
   belongs_to :repository
+  belongs_to :project
   
   attr_protected :user_id
     
-  validates_presence_of :user_id, :repository_id, :body
+  validates_presence_of :user_id, :repository_id, :body, :project_id
   
   
 end

--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -19,11 +19,12 @@ class Project < ActiveRecord::Base
   acts_as_taggable
   
   belongs_to  :user
+  has_many    :comments
   has_many    :repositories, :order => "mainline desc, created_at asc",
     :dependent => :destroy
   has_one     :mainline_repository, :conditions => ["mainline = ?", true], 
     :class_name => "Repository"
-  has_many    :branch_repositories, :conditions => ["mainline = ?", false],
+  has_many    :repository_clones, :conditions => ["mainline = ?", false],
     :class_name => "Repository"
     
   URL_FORMAT_RE = /^(http|https|nntp):\/\//.freeze

--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -96,6 +96,13 @@ class Repository < ActiveRecord::Base
     end
   end
   
+  def last_commit
+    if has_commits?
+      @last_commit ||= Git.bare(full_repository_path).log(1).first
+    end
+    @last_commit
+  end
+  
   def create_new_repos_task
     Task.create!(:target_class => self.class.name, 
       :command => parent ? "clone_git_repository" : "create_git_repository", 

--- a/app/models/ssh_key.rb
+++ b/app/models/ssh_key.rb
@@ -13,13 +13,13 @@
 class SshKey < ActiveRecord::Base
   belongs_to :user
   
-  SSH_KEY_FORMAT = /^ssh\-[a-z0-9]{3,4} [a-z0-9\+=\n\/]+ [a-z0-9_\.\-]*(@[a-z0-9\.\-]*)?$/ims
+  SSH_KEY_FORMAT = /^ssh\-[a-z0-9]{3,4} [a-z0-9\+=\/]+ [a-z0-9_\.\-]*(@[a-z0-9\.\-]*)?$/ims
   
   validates_presence_of :user_id, :key
   validates_format_of   :key, :with => SSH_KEY_FORMAT
   
   before_validation { |k| k.key.to_s.strip! }
-  before_save   :lint_key!
+  before_validation   :lint_key!
   after_create  :create_new_task
   # we only allow people to create/destroy keys after_update  :create_update_task 
   after_destroy :create_delete_task
@@ -32,7 +32,7 @@ class SshKey < ActiveRecord::Base
     %Q{### START KEY #{self.id || "nil"} ###\n} + 
     %Q{command="gitorious #{user.login}",no-port-forwarding,} + 
     %Q{no-X11-forwarding,no-agent-forwarding,no-pty #{key}} + 
-    %Q{\n### END KEY #{self.id || "nil"} ###}
+    %Q{\n### END KEY #{self.id || "nil"} ###\n}
   end 
   
   def self.add_to_authorized_keys(keydata, key_file_class=SshKeyFile)
@@ -59,6 +59,6 @@ class SshKey < ActiveRecord::Base
   
   protected
     def lint_key!
-      key.gsub!(/\n*/m, "")
+      self.key.gsub!(/(\r|\n)*/m, "")
     end
 end

--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -33,6 +33,8 @@ class User < ActiveRecord::Base
   attr_protected :login
 
   validates_presence_of     :login, :email
+  validates_format_of       :login, :with => /^[a-z0-9\-_\.]+$/i
+  validates_format_of       :email, :with => /^[^@\s]+@([\-a-z0-9]+\.)+[a-z]{2,}$/i
   validates_presence_of     :password,                   :if => :password_required?
   validates_presence_of     :password_confirmation,      :if => :password_required?
   validates_length_of       :password, :within => 4..40, :if => :password_required?

--- a/app/views/browse/blob.html.erb
+++ b/app/views/browse/blob.html.erb
@@ -1,8 +1,19 @@
 <% @page_title = "#{current_path.join("/")} - #{@repository.name} in #{@project.title}" -%>
+
+<ul class="mode_selector">
+  <li class="list_header">
+    Softwrap mode:
+  </li>
+  <li>
+    <%= link_to_function "Toggle", "Gitorious.Wordwrapper.toggle($$('table#codeblob td.code'))" -%>
+  </li>
+</ul>
+
 <h1>
   Blob of <code><%= current_path.join("/") -%></code> 
   <small>(<%= link_to "raw blob data", raw_blob_path(@blob.sha, current_path) -%>)</small>
 </h1>
-<pre><%=h @blob.contents -%></pre>
+
+<pre><%= with_line_numbers{ h(@blob.contents) } -%></pre>
 
 <%= render :partial => "submenu" -%>

--- a/app/views/browse/commit.html.erb
+++ b/app/views/browse/commit.html.erb
@@ -14,16 +14,23 @@
 
 <% #TODO: commit diff stats (as sparklines?) -%>
 
-<h2>Commit diff</h2>
-<%= render_diffmode_selector -%>
-
-<% @diff.each do |file| -%>
-  <h4><%= h(file.path) -%><%#=link_to h(file.path), blob_path(file.sha, file.path) -%></h4>
-  <%= render_diff(file.patch, file.src, file.dst, @diffmode) -%>
-  <small><%= link_to_function "toggle raw diff", "$('#{file.object_id}').toggle()" -%></small>
-  <div class="toggle_diff" style="display:none" id="<%= file.object_id -%>">
-  <p><pre><%=  h(file.patch) -%></pre></p>
-  </div>
+<% if @diff.blank? -%>
+  <p>
+    This is the initial commit in this repository, 
+    <%= link_to "browse the initial tree state", tree_path(@commit.gtree.sha) -%>.
+  </p>
+<% else -%>
+  <h2>Commit diff</h2>
+  <%= render_diffmode_selector -%>
+
+  <% @diff.each do |file| -%>
+    <h4><%= h(file.path) -%><%#=link_to h(file.path), blob_path(file.sha, file.path) -%></h4>
+    <%= render_diff(file.patch, file.src, file.dst, @diffmode) -%>
+    <small><%= link_to_function "toggle raw diff", "$('#{file.object_id}').toggle()" -%></small>
+    <div class="toggle_diff" style="display:none" id="<%= file.object_id -%>">
+    <p><pre><%=  h(file.patch) -%></pre></p>
+    </div>
+  <% end -%>
 <% end -%>
 
 <%= render :partial => "submenu" -%>
\ No newline at end of file

--- a/app/views/browse/index.atom.builder
+++ b/app/views/browse/index.atom.builder
@@ -1,6 +1,6 @@
 atom_feed do |feed|
   feed.title("Gitorious: #{@project.title} - #{@repository.name}")
-  feed.updated((@commits.first.date))
+  feed.updated((@commits.blank? ? nil : @commits.first.date))
 
   @commits.each do |commit|
     item_url = "http://gitorious.org" +  project_repository_commit_path(@project, @repository, commit.sha)

--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -13,7 +13,7 @@
   <%= GitoriousConfig["extra_html_head_data"] -%>
 </head>
 
-<body>
+<body id="<%= controller.controller_name -%>">
   <div id="container">
     <div id="header">
       <div class="login-logout">
@@ -34,8 +34,15 @@
       <div id="menu">
         <ul>
           <li><%= link_to "Home", root_path -%></li>
+          <% if logged_in? -%>
+          <li><%= link_to "Dashboard", dashboard_path -%></li>
+          <% end -%>
           <li><%= link_to "Projects", projects_path -%></li>
+          <% if logged_in? -%>
+          <li><%= link_to "FAQ", faq_path -%></li>
+          <% else -%>
           <li><%= link_to "About", about_path -%></li>
+          <% end -%>
         </ul>
       </div>
       <div id="submenu">
@@ -69,6 +76,7 @@
       <ul>
         <li><%= link_to "Home", root_path -%> | </li>
         <li><%= link_to "About", about_path -%> | </li>
+        <li><%= link_to "FAQ", faq_path -%> | </li>
         <li><%= link_to "Discussion group", "http://groups.google.com/group/gitorious" -%></li>
       </ul>
     </div>

--- a/app/views/projects/index.html.erb
+++ b/app/views/projects/index.html.erb
@@ -4,7 +4,7 @@
 <% @projects.each do |project| -%>
   <li>
     <h3><%= link_to project.title, project_path(project) -%></h3>
-    <em><%= truncate project.description, 100 -%></em>
+    <em><%= truncate project.description, 250 -%></em>
   </li>
 <% end -%>
 </ul>

--- a/app/views/projects/show.html.erb
+++ b/app/views/projects/show.html.erb
@@ -4,6 +4,7 @@
 
 <ul class="infobox">
   <li><strong>Owner:</strong> <%= link_to h(@project.user.login), user_path(@project.user) -%></li>
+  <li><strong>Created:</strong> <%= @project.created_at.to_s(:short) -%></li>
   <li><strong>Labels:</strong> 
     <%= @project.tag_list.blank? ? "none" : linked_tag_list_as_sentence(@project.tags) -%></li>
   <li><strong>License:</strong> <%= h(@project.license) -%></li>
@@ -26,7 +27,7 @@
   <thead>
     <th>Name</th>
     <th>Owner</th>
-    <th>Created</th>
+    <th>Last Commit</th>
     <th></th>
   </thead>
   <% @repositories.each do |repos| # fixme: need to graph the parent relation proper -%>
@@ -39,7 +40,7 @@
           <%= h(@project.slug) -%> (<%= link_to h(repos.user.login), user_path(repos.user) -%>)
         </td>
         <td>
-          <%= repos.created_at.to_s(:short) -%>
+          <%= repos.last_commit ? repos.last_commit.author.date.to_s(:short) : "<em>none</em>" -%>
         </td>
         <td><%= link_to "browse", project_repository_browse_path(@project, repos) -%></td>
       </tr>
@@ -52,7 +53,7 @@
           <%= link_to h(repos.user.login), user_path(repos.user) -%>
         </td>
         <td>
-          <%= repos.created_at.to_s(:short) -%>
+          <%= repos.last_commit ? repos.last_commit.author.date.to_s(:short) : "<em>none</em>" -%>
         </td>
         <td><%= link_to "browse", project_repository_browse_path(@project, repos) -%></td>
       </tr>

--- a/app/views/repositories/_infobox.html.erb
+++ b/app/views/repositories/_infobox.html.erb
@@ -6,8 +6,33 @@
     <%= link_to h(@repository.parent.gitdir), project_repository_path(@project, @repository.parent) -%>
   <% end -%>
   <li><strong>Created:</strong> <%= @repository.created_at.to_s(:short) -%></li>
-  <li><strong>Mirror url:</strong> <code><%=h @repository.clone_url -%></code></li>
+  <li>
+    <strong>Clone url:</strong> <code><%=h @repository.clone_url -%></code> 
+    <small><%= link_to_function "More info…", "$('detailed_clone_info').toggle()" -%></small>
+    <div id="detailed_clone_info" class="info_hint" style="display:none">
+      You can clone this repository with the following command:
+      <% if logged_in? && current_user.can_write_to?(@repository) -%>
+        <code>git clone <%= @repository.push_url -%></code>
+      <% else -%>
+        <code>git clone <%= @repository.clone_url -%></code>
+      <% end -%>
+    </div>
+  </li>
   <% if logged_in? && current_user.can_write_to?(@repository) -%>
-    <li><strong>push url:</strong> <code><%=h @repository.push_url -%></code></li>
+    <li>
+      <strong>Push url:</strong> <code><%=h @repository.push_url -%></code>
+      <small><%= link_to_function "More info…", "$('detailed_push_info').toggle()" -%></small>
+      <div id="detailed_push_info" class="info_hint" style="display:none">
+You can run "<code>git push git@gitorious.org:tumbline/mainline.git</code>", or 
+you can setup a remote by doing the following:
+<pre>
+git remote add origin <%= @repository.push_url %>
+# to push the master branch to the origin remote we added above:
+git push origin master 
+# after that you can just do:
+git push
+</pre>
+      </div>
+    </li>
   <% end -%>
 </ul>
\ No newline at end of file

--- a/app/views/repositories/show.html.erb
+++ b/app/views/repositories/show.html.erb
@@ -7,20 +7,19 @@
 <% render_if_ready(@repository) do -%>
 
   <%= render :partial => "infobox" -%>
-
-  <p>You can clone this repository with the following command:</p>
-  <% if logged_in? && current_user.can_write_to?(@repository) -%>
-    <pre>git clone <%= @repository.push_url -%></pre>
-  <% else -%>
-    <pre>git clone <%= @repository.clone_url -%></pre>
-  <% end -%>
   
   <ul class="tab_menu">
     <li class="selected">Recent commits</li>
     <li><%= link_to "comments (#{@comment_count})", project_repository_comments_path(@project, @repository) -%></li>
   </ul>
 
-  <h2>Recent commits <small>(<%= link_to "browse", project_repository_browse_path(@project, @repository) -%>)</small></h2>
+  <h2>
+    Recent commits 
+    <small>
+      (<%= link_to "Shortlog", project_repository_browse_path(@project, @repository) -%> | 
+      <%= link_to "HEAD tree", project_repository_tree_path(@project, @repository, "HEAD", []) -%>)
+    </small>
+  </h2>
   <ul>
     <% if @commits.blank? -%>
       <li><em>No commits yet…</em></li>

--- a/app/views/site/about.html.erb
+++ b/app/views/site/about.html.erb
@@ -46,45 +46,9 @@
     If you experience any technical issues feel free to  
     <a href="mailto:johan@johansorensen.com">send an email</a>, there's also the 
     <a href="http://groups.google.com/group/gitorious">discussion group</a> for more
-    general Gitorious discussions around Gitorious.
-  </p>
-</div>
-
-<div class="section">
-  <a name="faq"></a><h1>FAQ</h1>
-
-  <h3>How do I point my local Git repository at Gitorious?</h3>
-  <p>
-    Easiest way is to put something like the following in your <code>.git/config</code> 
-    file of the repository you wish to push:
-  <pre>
-  [remote "origin"]
-         url = git@gitorious.org:<em>project</em>/<em>repository.git</em>
-         fetch = +refs/heads/*:refs/remotes/origin/*
-  [branch "master"]
-         remote = origin
-         merge = refs/heads/master
-  </pre>
-    and then <code>git push origin master</code> to push the code to Gitorious.
-  </p>
-
-  <hr />
-
-  <h3>Why is my email displayed?</h3>
-  <p>
-    The email you used to signup with Gitorious is displayed to other users, so that they 
-    can contact you about your projects if they need to. We do however take light 
-    measures against crawlers by not displaying your email in completely plain text. <br />
-    But just to be clear: we won't sell or use any information you give to 
-    gitorious.org against you or anyone else for financial and/or personal gains.
-  </p>
-
-  <hr />
-
-  <h3>Why do I need to upload my public SSH key?</h3>
-  <p>
-    When you push to a Git repository, your public key is how we authenticate 
-    you and if have the permissions required to do a commit to a given repository
+    general Gitorious discussions around Gitorious. There's also the 
+    <a href="irc://irc.freenode.net/gitorious"><code>#gitorious</code></a> IRC 
+    channel on FreeNode.
   </p>
 </div>
 
@@ -92,6 +56,6 @@
   <ul class="links">
     <li><a href="#about">About</a></li>
     <li><a href="#contact">Contact</a></li>
-    <li><a href="#faq">FAQ</a></li>
+    <li><%= link_to "FAQ", faq_path -%></li>
   </ul>
 <% end -%>
\ No newline at end of file