--- a/.gitignore
+++ b/.gitignore
@@ -10,5 +10,6 @@ config/ultrasphinx/test.conf
 config/ultrasphinx/production.conf
 config/ultrasphinx/staging.conf
 db/schema.rb
+db/*.sqlite3
 .autotest
 db/sphinx/*

--- a/HACKING
+++ b/HACKING
@@ -2,12 +2,23 @@
 
 === Dependencies
 
-* bluecloth (http://rubyforge.org/projects/bluecloth/)
+Ruby libraries/bindings/gems
+
+* BlueCloth (http://rubyforge.org/projects/bluecloth/)
 * mime-types (http://rubyforge.org/projects/mime-types)
 * oniguruma (http://rubyforge.org/projects/oniguruma)
-** requires the oniguruma C library: (http://www.geocities.jp/kosako3/oniguruma/)
 * textpow (http://rubyforge.org/projects/textpow)
-* chronic
+* chronic (http://rubyforge.org/projects/chronic)
+* rmagick (http://rubyforge.org/projects/rmagick)
+
+Libraries/applications:
+
+* Git (http://git-scm.org)
+* Oniguruma C library (http://www.geocities.jp/kosako3/oniguruma/)
+* Sphinx (http://sphinxsearch.com/)
+
+(App is deployed on mysql, allthough source should be free of mysql-isms/quirks)
+
 
 === The Hackers digest guide:
 
@@ -23,3 +34,22 @@
 
 Consult the mailinglist (http://groups.google.com/group/gitorious) or drop in 
 by #gitorious on irc.freenode.net if you have questions.
+
+
+=== Tasks and other scripts
+
+* script/task_performer runs any tasks in the queue (creating repositories etc)
+* script/graph_generator generates graph.
+* rake ultrasphinx:index runs the search indexer
+
+
+=== Coding style
+
+* Two spaces, no tabs, for indention
+* Don't use and and or for boolean tests, instead always use && and ||
+* MyClass.my_method(my_arg) -- not my_method( my_arg ) or my_method my_arg
+* Unless presedence is an issue; do .. end for multi-line blocks, braces for single line blocks
+* Follow the conventions you see used in the source already
+
+(copied mostly verbatim from dev.rubyonrails.org)
+

--- a/app/helpers/blobs_helper.rb
+++ b/app/helpers/blobs_helper.rb
@@ -21,7 +21,15 @@ module BlobsHelper
   
   def render_highlighted(text, filename, theme = "idle")
     syntax_name = Uv.syntax_names_for_data(filename, text).first #TODO: render a choice select box if > 1
-    highlighted = Uv.parse(text, "xhtml", syntax_name, false, theme)
+    begin
+      highlighted = Uv.parse(text, "xhtml", syntax_name, false, theme)
+    rescue => e
+      if e.to_s =~ /Oniguruma Error/
+        highlighted = text
+      else
+        raise e
+      end
+    end
     line_numbers_for(highlighted, theme)
   end
   

--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -7,7 +7,7 @@ class MergeRequest < ActiveRecord::Base
       :association_name => "user",
       :field => "login",
       :as => "proposed_by"
-    }]
+    }], :conditions => "status = 0"
   
   attr_protected :user_id, :status
     

--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -182,7 +182,7 @@ class Repository < ActiveRecord::Base
     labels = []
     data = []
     
-    max = 5
+    max = 8
     others = []
     top = sorted
     

--- a/app/views/merge_requests/show.html.erb
+++ b/app/views/merge_requests/show.html.erb
@@ -17,7 +17,7 @@
 
   <% if @merge_request.open? -%>
   <p>The simplest way to merge in these changes is to simply pull them in with the following command:</p>
-  <pre>git pull <%= @merge_request.source_repository.clone_url -%></pre>
+  <pre>git pull <%= @merge_request.source_repository.clone_url -%> <%= @merge_request.source_branch -%></pre>
   <% end -%>
 <% end -%>
 

--- a/config/initializers/ultrasphinx.rb
+++ b/config/initializers/ultrasphinx.rb
@@ -14,7 +14,7 @@ Ultrasphinx::Search.query_defaults = HashWithIndifferentAccess.new({
       Ultrasphinx::MAIN_INDEX, 
       (Ultrasphinx::DELTA_INDEX if Ultrasphinx.delta_index_present?)
     ].compact,
-  :weights => { "title" => 2.0, "name" => 2.0 },
+  :weights => { "title" => 3.0, "name" => 2.0 },
   :class_names => [],
   :filters => {},
   :facets => []

--- a/config/ultrasphinx/default.base
+++ b/config/ultrasphinx/default.base
@@ -77,8 +77,8 @@ index
   html_index_attrs =
   
   # Enable these if you need wildcard searching. They will slow down indexing significantly.
-  #   min_infix_len = 1    
-  #   enable_star = 1 
+  min_infix_len = 1    
+  enable_star = 1 
     
   charset_type = utf-8 # or sbcs (Single Byte Character Set)
   charset_table = 0..9, A..Z->a..z, -, _, ., &, a..z, U+410..U+42F->U+430..U+44F, U+430..U+44F,U+C5->U+E5, U+E5, U+C4->U+E4, U+E4, U+D6->U+F6, U+F6, U+16B, U+0c1->a, U+0c4->a, U+0c9->e, U+0cd->i, U+0d3->o, U+0d4->o, U+0da->u, U+0dd->y, U+0e1->a, U+0e4->a, U+0e9->e, U+0ed->i, U+0f3->o, U+0f4->o, U+0fa->u, U+0fd->y, U+104->U+105, U+105, U+106->U+107, U+10c->c, U+10d->c, U+10e->d, U+10f->d, U+116->U+117, U+117, U+118->U+119, U+11a->e, U+11b->e, U+12E->U+12F, U+12F, U+139->l, U+13a->l, U+13d->l, U+13e->l, U+141->U+142, U+142, U+143->U+144, U+144,U+147->n, U+148->n, U+154->r, U+155->r, U+158->r, U+159->r, U+15A->U+15B, U+15B, U+160->s, U+160->U+161, U+161->s, U+164->t, U+165->t, U+16A->U+16B, U+16B, U+16e->u, U+16f->u, U+172->U+173, U+173, U+179->U+17A, U+17A, U+17B->U+17C, U+17C, U+17d->z, U+17e->z,

--- a/db/schema.rb
+++ /dev/null
@@ -1,151 +0,0 @@
-# This file is auto-generated from the current state of the database. Instead of editing this file, 
-# please use the migrations feature of ActiveRecord to incrementally modify your database, and
-# then regenerate this schema definition.
-#
-# Note that this schema.rb definition is the authoritative source for your database schema. If you need
-# to create the application database on another system, you should be using db:schema:load, not running
-# all the migrations from scratch. The latter is a flawed and unsustainable approach (the more migrations
-# you'll amass, the slower it'll run and the greater likelihood for issues).
-#
-# It's strongly recommended to check this file into your version control system.
-
-ActiveRecord::Schema.define(:version => 22) do
-
-  create_table "comments", :force => true do |t|
-    t.integer  "user_id",                       :null => false
-    t.integer  "repository_id",                 :null => false
-    t.string   "sha1",          :default => "", :null => false
-    t.text     "body"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.integer  "project_id"
-  end
-
-  add_index "comments", ["user_id"], :name => "index_comments_on_user_id"
-  add_index "comments", ["repository_id"], :name => "index_comments_on_repository_id"
-  add_index "comments", ["sha1"], :name => "index_comments_on_sha1"
-  add_index "comments", ["project_id"], :name => "index_comments_on_project_id"
-
-  create_table "committerships", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "repository_id"
-    t.integer  "kind",          :default => 2
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "committerships", ["user_id"], :name => "index_permissions_on_user_id"
-  add_index "committerships", ["repository_id"], :name => "index_permissions_on_repository_id"
-
-  create_table "merge_requests", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "source_repository_id"
-    t.integer  "target_repository_id"
-    t.text     "proposal"
-    t.string   "sha_snapshot"
-    t.integer  "status",               :default => 0
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.string   "source_branch"
-    t.string   "target_branch"
-  end
-
-  add_index "merge_requests", ["user_id"], :name => "index_merge_requests_on_user_id"
-  add_index "merge_requests", ["source_repository_id"], :name => "index_merge_requests_on_source_repository_id"
-  add_index "merge_requests", ["target_repository_id"], :name => "index_merge_requests_on_target_repository_id"
-  add_index "merge_requests", ["status"], :name => "index_merge_requests_on_status"
-
-  create_table "projects", :force => true do |t|
-    t.string   "title"
-    t.text     "description"
-    t.integer  "user_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.string   "slug"
-    t.string   "license"
-    t.string   "home_url"
-    t.string   "mailinglist_url"
-    t.string   "bugtracker_url"
-  end
-
-  add_index "projects", ["slug"], :name => "index_projects_on_slug", :unique => true
-  add_index "projects", ["title"], :name => "index_projects_on_name"
-  add_index "projects", ["user_id"], :name => "index_projects_on_user_id"
-
-  create_table "repositories", :force => true do |t|
-    t.string   "name"
-    t.integer  "project_id"
-    t.integer  "user_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.boolean  "mainline",   :default => false
-    t.integer  "parent_id"
-    t.boolean  "ready",      :default => false
-  end
-
-  add_index "repositories", ["name"], :name => "index_repositories_on_name"
-  add_index "repositories", ["project_id"], :name => "index_repositories_on_project_id"
-  add_index "repositories", ["user_id"], :name => "index_repositories_on_user_id"
-  add_index "repositories", ["parent_id"], :name => "index_repositories_on_parent_id"
-  add_index "repositories", ["ready"], :name => "index_repositories_on_ready"
-
-  create_table "ssh_keys", :force => true do |t|
-    t.integer  "user_id"
-    t.text     "key"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.boolean  "ready",      :default => false
-  end
-
-  add_index "ssh_keys", ["user_id"], :name => "index_ssh_keys_on_user_id"
-
-  create_table "taggings", :force => true do |t|
-    t.integer  "tag_id"
-    t.integer  "taggable_id"
-    t.string   "taggable_type"
-    t.datetime "created_at"
-  end
-
-  add_index "taggings", ["tag_id"], :name => "index_taggings_on_tag_id"
-  add_index "taggings", ["taggable_id", "taggable_type"], :name => "index_taggings_on_taggable_id_and_taggable_type"
-
-  create_table "tags", :force => true do |t|
-    t.string "name"
-  end
-
-  add_index "tags", ["name"], :name => "index_tags_on_name", :unique => true
-
-  create_table "tasks", :force => true do |t|
-    t.string   "target_class"
-    t.string   "command"
-    t.text     "arguments"
-    t.boolean  "performed",    :default => false
-    t.datetime "performed_at"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.integer  "target_id"
-  end
-
-  add_index "tasks", ["performed"], :name => "index_tasks_on_performed"
-
-  create_table "users", :force => true do |t|
-    t.string   "login"
-    t.string   "email"
-    t.string   "crypted_password",          :limit => 40
-    t.string   "salt",                      :limit => 40
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.string   "remember_token"
-    t.datetime "remember_token_expires_at"
-    t.string   "activation_code",           :limit => 40
-    t.datetime "activated_at"
-    t.integer  "ssh_key_id"
-    t.string   "fullname"
-    t.text     "url"
-  end
-
-  add_index "users", ["login"], :name => "index_users_on_login"
-  add_index "users", ["email"], :name => "index_users_on_email"
-  add_index "users", ["ssh_key_id"], :name => "index_users_on_ssh_key_id"
-
-end

--- a/lib/gitorious/graphs/builder.rb
+++ b/lib/gitorious/graphs/builder.rb
@@ -1,6 +1,8 @@
 require "gruff"
 
-Gruff::Base::TITLE_MARGIN = 2.0
+silence_warnings do
+  Gruff::Base::TITLE_MARGIN = 2.0
+end
 
 module Gitorious
   module Graphs    

--- a/vendor/plugins/googlecharts/History.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-== 1.1.0
-* fixed another bug fix related to the uri escaping required to download the file properly.
-== 1.0.0
-* fixed the (URI::InvalidURIError) issue
-== 0.2.0
-* added export options (file and image tag)
-* added support for all arguments to be passed as a string or an array
-
-== 0.1.0 2007-12-11
-* fixed the axis labels
-
-== 0.0.3 2007-12-11
-* added :chart_background alias and fixed a bug related to the background colors.
-
-== 0.0.2 2007-12-11
-* added support for more features and aliases
-
-== 0.0.1 2007-12-08
-
-* 1 major enhancement:
-  * Initial release

--- a/vendor/plugins/googlecharts/License.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-Copyright (c) 2007 Matt Aimonetti
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file

--- a/vendor/plugins/googlecharts/Manifest.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-History.txt
-License.txt
-Manifest.txt
-README.txt
-Rakefile
-config/hoe.rb
-config/requirements.rb
-lib/gchart.rb
-lib/gchart/aliases.rb
-lib/gchart/version.rb
-log/debug.log
-script/destroy
-script/generate
-script/txt2html
-setup.rb
-spec/gchart_spec.rb
-spec/spec.opts
-spec/spec_helper.rb
-tasks/deployment.rake
-tasks/environment.rake
-tasks/rspec.rake
-tasks/website.rake
-website/index.html
-website/index.txt
-website/javascripts/rounded_corners_lite.inc.js
-website/stylesheets/screen.css
-website/template.rhtml

--- a/vendor/plugins/googlecharts/README.txt
+++ /dev/null
@@ -1,179 +0,0 @@
-The goal of this Gem is to make the creation of Google Charts a simple and easy task.
-
-Gchart.line(  :size => '200x300', 
-              :title => "example title",
-              :bg => 'efefef',
-              :legend => ['first data set label', 'second data set label'],
-              :data => [10, 30, 120, 45, 72])
-              
-
-
-==Chart Type
-
-This gem supports the following types of charts:
-  
-  * line, 
-  * line_xy
-  * scatter
-  * bar
-  * venn
-  * pie
-  * pie_3d
-
-To create a chart, simply require Gchart and call any of the existing type:
-
-    require 'gchart'
-    Gchart.pie
-  
-  
-==Chart Title
-
-  To add a title to a chart pass the title to your chart:
-  
-    Gchart.line(:title => 'Sexy Charts!')
-    
-You can also specify the color and/or size
-    
-    Gchart.line(:title => 'Sexy Charts!', :title_color => 'FF0000', :title_size => '20')
-
-==Colors
-
-Specify a color with at least a 6-letter string of hexadecimal values in the format RRGGBB. For example:
-
-    * FF0000 = red
-    * 00FF00 = green
-    * 0000FF = blue
-    * 000000 = black
-    * FFFFFF = white
-
-You can optionally specify transparency by appending a value between 00 and FF where 00 is completely transparent and FF completely opaque. For example:
-
-    * 0000FFFF = solid blue
-    * 0000FF00 = transparent blue
-
-If you need to use multiple colors, check the doc. Usually you just need to pass :attribute => 'FF0000,00FF00'
-
-Some charts have more options than other, make sure to refer to the documentation.
-
-===Background options:
-
-If you don't set the background option, your graph will be transparent.
-
-* You have 3 types of background  http://code.google.com/apis/chart/#chart_or_background_fill
-
-- solid
-- gradient
-- stripes
-
-By default, if you set a background color, the fill will be solid:
-
-    Gchart.bar(:bg => 'efefef')
-
-However you can specify another fill type such as:
-            
-    Gchart.line(:bg => {:color => 'efefef', :type => 'gradient'})
-  
-In the above code, we decided to have a gradient background, however since we only passed one color, the chart will start by the specified color and transition to white. By the default, the gradient angle is 0. Change it as follows:
-
-    Gchart.line(:title =>'bg example', :bg => {:color => 'efefef', :type => 'gradient', :angle => 90})
-    
-For a more advance use of colors, refer to http://code.google.com/apis/chart/#linear_gradient
-
-    Gchart.line(:bg => {:color => '76A4FB,1,ffffff,0', :type => 'gradient'})
-    
-    
-The same way you set the background color, you can also set the graph background:
-
-    Gchart.line(:graph_bg => 'cccccc')
-    
-or both
-
-    Gchart.line(:bg => {:color => '76A4FB,1,ffffff,0', :type => 'gradient'}, :graph_bg => 'cccccc', :title => 'Sexy Chart')
-    
-    
-Another type of fill is stripes http://code.google.com/apis/chart/#linear_stripes
-
-    Gchart.line(:bg => {:color => 'efefef', :type => 'stripes'})
-    
-You can customize the amount of stripes, colors and width by changing the color value.
-    
-    
-== Legend & Labels
-
-You probably will want to use a legend or labels for your graph.
-
-    Gchart.line(:legend => 'legend label')
-or
-    Gchart.line(:legend => ['legend label 1', 'legend label 2'])
-    
-Will do the trick. You can also use the labels alias (makes more sense when using the pie charts)
-
-    chart = Gchart.pie(:labels => ['label 1', 'label 2'])
-
-== Multiple axis labels 
-
-Multiple axis labels are available for line charts, bar charts and scatter plots.
-
-* x = bottom x-axis
-* t = top x-axis
-* y = left y-axis
-* r = right y-axis
-
-    Gchart.line(:label_axis => 'x,y,r')
-  
-To add labels on these axis:
-
-    Gchart.line(:axis_labels => ['Jan|July|Jan|July|Jan', '0|100', 'A|B|C', '2005|2006|2007'])
-
-    
-== Data options
-
-Data are passed using an array or a nested array.    
-
-  Gchart.bar(:data => [1,2,4,67,100,41,234])  
-  
-  Gchart.bar(:data => [[1,2,4,67,100,41,234],[45,23,67,12,67,300, 250]])
-  
-By default, the graph is drawn with your max value representing 100% of the height or width of the graph. You can change that my passing the max value.
-
-  Gchart.bar(:data => [1,2,4,67,100,41,234], :max_value => 300)
-  Gchart.bar(:data => [1,2,4,67,100,41,234], :max_value => 'auto')
-  
-or if you want to use the real values from your dataset:
-
-  Gchart.bar(:data => [1,2,4,67,100,41,234], :max_value => false)
-  
-  
-You can also define a different encoding to add more granularity:
-
-  Gchart.bar(:data => [1,2,4,67,100,41,234], :encoding => 'simple') 
-  Gchart.bar(:data => [1,2,4,67,100,41,234], :encoding => 'extended') 
-  Gchart.bar(:data => [1,2,4,67,100,41,234], :encoding => 'text') 
-  
-
-==Pies:
-  
-you have 2 type of pies:
-  - Gchart.pie() the standard 2D pie
-  _ Gchart.pie_3d() the fancy 3D pie
-  
-To set labels, you can use one of these two options:
-
-    @legend = ['Matt_fu', 'Rob_fu']
-    Gchart.pie_3d(:title => @title, :labels => @legend, :data => @data, :size => '400x200')
-    Gchart.pie_3d(:title => @title, :legend => @legend, :data => @data, :size => '400x200')
-  
-  
-  
-=== try yourself
-
-Gchart.bar( :data => [[1,2,4,67,100,41,234],[45,23,67,12,67,300, 250]], 
-            :title => 'SDRuby Fu level', 
-            :legend => ['matt','patrick'], 
-            :bg => {:color => '76A4FB', :type => 'gradient'}, 
-            :bar_colors => 'ff0000,00ff00')
-
- "http://chart.apis.google.com/chart?chs=300x200&chdl=matt|patrick&chd=s:AAANUIv,JENCN9y&chtt=SDRuby+Fu+level&chf=bg,lg,0,76A4FB,0,ffffff,1&cht=bvs&chco=ff0000,00ff00"  
- 
-Gchart.pie(:data => [20,10,15,5,50], :title => 'SDRuby Fu level', :size => '400x200', :labels => ['matt', 'rob', 'patrick', 'ryan', 'jordan'])
-http://chart.apis.google.com/chart?cht=p&chs=400x200&chd=s:YMSG9&chtt=SDRuby+Fu+level&chl=matt|rob|patrick|ryan|jordan

--- a/vendor/plugins/googlecharts/Rakefile
+++ /dev/null
@@ -1,4 +0,0 @@
-require 'config/requirements'
-require 'config/hoe' # setup Hoe + all gem configuration
-
-Dir['tasks/**/*.rake'].each { |rake| load rake }
\ No newline at end of file