--- a/AUTHORS
+++ b/AUTHORS
@@ -12,11 +12,14 @@ Contributors
 -------------
 
 A number of people have contributed directly to Gitorious by writing documentation 
-or developing code and/or graphics. A list of these people in alphabetical order is included 
-below:
+or developing code and/or graphics that the project wishes to thank. 
+A list of these people in order of appearance:
 
   * David A. Cuadrado <krawek@gmail.com>
   * August Lilleaas <augustlilleaas@gmail.com>
 	* Simon Bohlin <simon.bohlin@zondera.com>
-	* Will <will@gina.alaska. edu>
-	
\ No newline at end of file
+	* Tim Dysinger <tim@dysinger.net>
+	* Dag Odenhall <dag.odenhall@gmail.com>
+	* Will Fisher <will@gina.alaska.edu>
+  * Jonas Fonseca <fonseca@diku.dk>
+  
\ No newline at end of file

--- a/TODO.txt
+++ b/TODO.txt
@@ -1,5 +1,10 @@
 (in no particular order)
 
+two from Yurii:
+1) show commits actually merged for merge request after actual merge (I see them on open request, but do not on merged one) 
+2) provide clone url on every repo browsing page, so I can get url to pull from even if I am reading a commit
+
+* tree browser: deal better with funny characters: http://gitorious.org/projects/avara/repos/mainline/trees/master
 * if you comment on a specific commit, you should get redirected back there
 * graphs should show username (if we have it) for avoiding confusion and for consistency
 ** Repository#commit_graph_data_by_author should just use git-shortlog summary instead of jumping through hoops about it

--- /dev/null
+++ b/app/models/cloner.rb
@@ -0,0 +1,3 @@
+class Cloner < ActiveRecord::Base
+  belongs_to :repository
+end

--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -144,6 +144,7 @@ class Project < ActiveRecord::Base
 
     # Try our best to guess the url
     def clean_url(url)
+      return if url.blank?
       begin
         url = "http://#{url}" if URI.parse(url).class == URI::Generic
       rescue

--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -9,6 +9,7 @@ class Repository < ActiveRecord::Base
     :order => "status, id desc", :dependent => :destroy
   has_many    :proposed_merge_requests, :foreign_key => 'source_repository_id', 
                 :class_name => 'MergeRequest', :order => "id desc", :dependent => :destroy
+  has_many    :cloners, :dependent => :destroy
   
   validates_presence_of :user_id, :project_id, :name
   validates_format_of :name, :with => /^[a-z0-9_\-]+$/i,
@@ -28,6 +29,14 @@ class Repository < ActiveRecord::Base
     find_by_name(name) || raise(ActiveRecord::RecordNotFound)
   end
   
+  def self.find_by_path(path)
+    base_path = path.gsub(/^#{Regexp.escape(GitoriousConfig['repository_base_path'])}/, "")
+    repo_name, project_name = base_path.split("/").reverse
+    
+    project = Project.find_by_slug!(project_name)
+    project.repositories.find_by_name(repo_name.sub(/\.git/, ""))
+  end
+  
   def self.create_git_repository(path)
     git_backend.create(full_path_from_partial_path(path))
   end
@@ -221,6 +230,10 @@ class Repository < ActiveRecord::Base
     users_by_email = users.inject({}){|hash, user| hash[user.email] = user; hash }
     users_by_email
   end
+  
+  def cloned_from(ip, country_code = "--", country_name = nil)
+    cloners.create(:ip => ip, :date => Time.now.utc, :country_code => country_code, :country => country_name)
+  end
     
   protected
     def set_as_mainline_if_first

--- a/app/views/committers/auto_complete_for_user_login.js.erb
+++ b/app/views/committers/auto_complete_for_user_login.js.erb
@@ -1,9 +1,9 @@
 <ul>
 <% @users.each do |user| -%>
 <li class="committer">
-<div class="image"><%= gravatar user.email, :size => 32 -%></div>
-<div class="login"><%=h user.login -%></div>
-<div class="email"><span class="informal"><%=h user.email -%></span></div>
+  <div class="image"><%= gravatar user.email, :size => 32 -%></div>
+  <div class="login"><%=h user.login -%></div>
+  <div class="email"><span class="informal"><%=h user.email -%></span></div>
 </li>
 <% end -%>
 </ul>
\ No newline at end of file

--- a/app/views/committers/new.html.erb
+++ b/app/views/committers/new.html.erb
@@ -28,7 +28,7 @@
   :url => {:controller => "committers", :action => "create"}, :method => :post do |f| -%>
   <p>
     <%= f.label :login, "Existing username <small>(search-as-you-type)</small>" -%><br />
-    <%= text_field_with_auto_complete :user, :login, {}, :skip_style => true -%>
+    <%= text_field_with_auto_complete :user, :login, {}, :skip_style => true, :select => :login -%>
   </p>
   <p>
     <%= f.submit "Add as committer" -%> or <%= link_to "cancel", [@repository.project, @repository] -%>

--- a/app/views/repositories/_infobox.html.erb
+++ b/app/views/repositories/_infobox.html.erb
@@ -41,4 +41,5 @@ git push
       </div>
     </li>
   <% end -%>
+  <li>The repository has been cloned <%= @repository.cloners.size %> times.</li>
 </ul>
\ No newline at end of file

--- a/app/views/site/about.html.erb
+++ b/app/views/site/about.html.erb
@@ -28,7 +28,7 @@
   	<li>Making it easier for maintainers to accept contributions</li>
   </ul>
   
-  <p>Gitorious still under development and there's many many more things I'd like 
+  <p>Gitorious is still under development and there's many many more things I'd like 
     to do with it. If you have ideas for improvements or technical issues please 
     do stop by the <a href="http://groups.google.com/group/gitorious">discussion group</a>.</p>
   

--- a/app/views/site/faq.html.erb
+++ b/app/views/site/faq.html.erb
@@ -4,7 +4,7 @@
 <p>
   Most likely the repository you're trying to clone is empty, and the error 
   message is git's friendly way of telling you that. See below (or by clicking 
-  "more info" next to repositorys "push url") for info on how t push to it.
+  "more info" next to the repository's "push url") for info on how to push to it.
 </p>
 
 <hr />
@@ -52,7 +52,7 @@
 <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
+  you and check if have the permissions required to do a commit to a given repository
 </p>
 
 <hr />

--- a/app/views/trees/show.html.erb
+++ b/app/views/trees/show.html.erb
@@ -14,11 +14,15 @@
     <% else -%>
       <td class="node file"><%= link_to h(node.basename), blob_path(params[:id], node.name) -%></td>
     <% end -%>
-    <% last_commit = commit_for_tree_path(@repository, node.name) -%>
-    <td class="meta"><%= last_commit.committed_date.to_s(:short) -%></td>
-    <td class="meta commit_message">
-      <%= link_to truncate(h(last_commit.message), 75, "&hellip;"), commit_path(last_commit.id) -%>
-    </td>
+    <% if last_commit = commit_for_tree_path(@repository, node.name) -%>
+      <td class="meta"><%= last_commit.committed_date.to_s(:short) -%></td>
+      <td class="meta commit_message">
+        <%= link_to truncate(h(last_commit.message), 75, "&hellip;"), commit_path(last_commit.id) -%>
+      </td>
+    <% else -%>
+      <td class="meta"></td>
+      <td class="meta commit_message"></td>
+    <% end -%>
   </tr>
   <% end -%>
 </table>

Binary files /dev/null and b/data/GeoIP.dat differ

--- /dev/null
+++ b/db/migrate/023_create_cloners.rb
@@ -0,0 +1,16 @@
+class CreateCloners < ActiveRecord::Migration
+  def self.up
+    create_table :cloners do |t|
+      t.string :ip
+      t.string :country_code, :length => 2
+      t.string :country
+      t.datetime :date
+      t.integer :repository_id
+    end
+  end
+
+  def self.down
+    drop_table :cloners
+  end
+end
+

--- a/log/.gitignore
+++ b/log/.gitignore
@@ -1 +1,2 @@
-*.log
\ No newline at end of file
+*.log
+*.pid

--- /dev/null
+++ b/script/git-daemon
@@ -0,0 +1,214 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+require 'daemons'
+require 'geoip'
+require 'socket'
+require "optparse"
+
+ENV["RAILS_ENV"] ||= "production"
+require File.dirname(__FILE__)+'/../config/environment'
+
+Rails.configuration.log_level = :info # Disable debug
+ActiveRecord::Base.allow_concurrency = true
+
+BASE_PATH = File.expand_path(GitoriousConfig['repository_base_path'])
+
+TIMEOUT = 30
+MAX_CHILDREN = 30
+$children_reaped = 0
+$children_active = 0
+
+module Git
+  class Daemon
+    include Daemonize
+    
+    SERVICE_REGEXP = /(\w{4})(git\-upload\-pack)\s(.+)\x0host=([\w\.\-]+)/.freeze
+    
+    def initialize(options)
+      @options = options
+    end
+    
+    def start
+      if @options[:daemonize]
+        daemonize(@options[:logfile])
+        File.open(@options[:pidfile], "w") do |f| 
+          f.write(Process.pid)
+        end
+      end
+      @socket = TCPServer.new(@options[:host], @options[:port])
+      log(Process.pid, "Listening on #{@options[:host]}:#{@options[:port]}...")
+      run
+    end
+      
+    def run
+      while session = @socket.accept
+        connections = $children_active - $children_reaped
+        if connections > MAX_CHILDREN
+          log(Process.pid, "too many active children #{connections}/#{MAX_CHILDREN}")
+          session.close
+          next
+        end
+        
+        run_service(session)
+      end
+    end
+    
+    def run_service(session)
+      $children_active += 1
+      ip_family, port, name, ip = session.peeraddr
+      
+      line = session.recv(1000)
+      
+      if line =~ SERVICE_REGEXP
+        start_time = Time.now
+        code = $1
+        service = $2
+        base_path = $3
+        host = $4
+      
+        path = File.expand_path("#{BASE_PATH}/#{base_path}")
+        if !path.index(BASE_PATH) == 0 || !File.directory?(path)
+          log(Process.pid, "Invalid path: #{base_path}")
+          session.close
+          $children_active -= 1
+          return
+        end
+      
+        if !File.exist?(File.join(path, "git-daemon-export-ok"))
+          session.close
+          $children_active -= 1
+          return
+        end
+      
+        Dir.chdir(path) do
+          cmd = "git-upload-pack --strict --timeout=#{TIMEOUT} ."
+        
+          fork do
+            repository = nil
+            
+            begin
+              repository = ::Repository.find_by_path(path)
+            rescue => e
+              log(Process.pid, "AR error: #{e.class.name} #{e.message}:\n #{e.backtrace.join("\n  ")}")
+            end
+            
+            pid = Process.pid
+            log(pid, "Connection from #{ip} for #{path.inspect}")
+          
+            $stdout.reopen(session)
+            $stdin.reopen(session)
+            session.close
+            
+            if repository
+              if ip_family == "AF_INET6"
+                repository.cloned_from(ip)
+              else
+                geoip = GeoIP.new(File.join(RAILS_ROOT, "data", "GeoIP.dat"))
+                localization = geoip.country(ip)
+                repository.cloned_from(ip, localization[3], localization[5])
+              end
+            else
+              log(pid, "Cannot find repository: #{path}")
+            end
+            log(Process.pid, "Deferred in #{'%0.5f' % (Time.now - start_time)}s")
+            
+            exec(cmd)
+            # FIXME; we don't ever get here since we exec(), so reaped count may be incorrect 
+            $children_reaped += 1
+            exit!
+          end
+        end rescue Errno::EAGAIN
+      else
+        $stderr.puts "Invalid request from #{ip}: #{line}"
+        session.close
+        $children_active -= 1
+      end
+    end
+  
+    def handle_stop(signal)
+      log(Process.pid, "Received #{signal}, exiting..")
+      exit 0
+    end
+  
+    def handle_cld
+      loop do
+        pid = nil
+        begin
+          pid = Process.wait(-1, Process::WNOHANG)
+        rescue Errno::ECHILD
+          break
+        end
+        
+        if pid && $?
+          $children_reaped += 1
+          log(pid, "Disconnected. (status=#{$?.exitstatus})") if pid > 0
+          if $children_reaped == $children_active
+            $children_reaped = 0
+            $children_active = 0 
+          end
+          
+          next
+        end
+        break
+      end
+    end
+  
+    def log(pid, msg)
+      $stderr.puts "#{Time.now.strftime("%Y-%m-%d %H:%M:%S")} [#{pid}] #{msg}"
+    end
+  
+  end
+end
+
+options = {
+  :port => 9418,
+  :host => "0.0.0.0",
+  :logfile => File.join(RAILS_ROOT, "log", "git-daemon.log"),
+  :pidfile => File.join(RAILS_ROOT, "log", "git-daemon.pid"),
+  :daemonize => false
+  
+}
+
+OptionParser.new do |opts|
+  opts.banner = "Usage: #{$0} [options]"
+
+  opts.on("-p", "--port=[port]", Integer, "Port to listen on", "Default: #{options[:port]}") do |o|
+    options[:port] = o
+  end
+
+  opts.on("-a", "--address=[host]", "Host to listen on", "Default: #{options[:host]}") do |o|
+    options[:host] = o
+  end
+  
+  opts.on("-l", "--logfile=[file]", "File to log to", "Default: #{options[:logfile]}") do |o|
+    options[:logfile] = o
+  end
+  
+  opts.on("-P", "--pidfile=[file]", "PID file to use (if daemonized)", "Default: #{options[:pidfile]}") do |o|
+    options[:pidfile] = o
+  end
+  
+  opts.on("-d", "--daemonize", "Daemonize or run in foreground", "Default: #{options[:daemonize]}") do |o|
+    options[:daemonize] = o
+  end
+  
+  opts.on_tail("-h", "--help", "Show this help message.") do
+    puts opts
+    exit
+  end
+  
+  # opts.on("-e", "--environment", "RAILS_ENV to use") do |o|
+  #   options[:port] = o
+  # end
+end.parse!
+
+@git_daemon = Git::Daemon.new(options)
+
+trap("SIGKILL")  { @git_daemon.handle_stop("SIGKILL") }
+trap("TERM")     { @git_daemon.handle_stop("TERM")    }
+trap("SIGINT")   { @git_daemon.handle_stop("SIGINT")  }
+trap("CLD")      { @git_daemon.handle_cld  }
+
+@git_daemon.start
+

--- /dev/null
+++ b/spec/fixtures/cloners.yml
@@ -0,0 +1,13 @@
+# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
+
+argentina:
+  ip: 200.45.34.21
+  country: Argentina
+  country_code: AR
+  date: 2008-04-13 23:40:30
+
+mexico:
+  ip: 200.53.12.21
+  country: Mexico
+  country_code: MX
+  date: 2008-04-13 23:40:30

--- /dev/null
+++ b/spec/models/cloner_spec.rb
@@ -0,0 +1,18 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+require 'geoip'
+
+describe Cloner do
+  before(:all) do
+    @geoip = GeoIP.new(File.join(RAILS_ROOT, "data", "GeoIP.dat"))
+  end
+  
+  before(:each) do
+    @cloner = Cloner.new
+  end
+
+  it "should has a valid country" do
+    localization = @geoip.country(cloners(:argentina).ip)
+    localization[3].should == cloners(:argentina).country_code
+    localization[5].should == cloners(:argentina).country
+  end
+end

--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -103,5 +103,15 @@ describe Project do
       project.send(attr).should == 'http://blah.com'
     end
   end
+  
+  it "should not prepend http:// to empty urls" do
+    project = projects(:johans)
+    [ :home_url, :mailinglist_url, :bugtracker_url ].each do |attr|
+      project.send("#{attr}=", '')
+      project.send(attr).should be_blank
+      project.send("#{attr}=", nil)
+      project.send(attr).should be_blank
+    end
+  end
 
 end