diff --git a/app/views/projects/git/blobs/_render_as_binary.html.haml b/app/views/projects/git/blobs/_render_as_binary.html.haml
index bd7379a10..a8fd16a3d 100644
--- a/app/views/projects/git/blobs/_render_as_binary.html.haml
+++ b/app/views/projects/git/blobs/_render_as_binary.html.haml
@@ -4,5 +4,5 @@
     %td.blob
       :plain
         <br/>
-        <pre>#{link_to @blob.basename, raw_path(@project, @treeish, @path)}</pre>
+        <pre>#{link_to_unless @blob.huge?, @blob.basename, raw_path(@project, @treeish, @path)}</pre>
         <br/>
\ No newline at end of file
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 37372580c..b3ca044d1 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -62,7 +62,7 @@ Rosa::Application.configure do
   config.assets.digest = true
 
   # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
-  config.assets.precompile += %w(login.css login.js reg_session.css tour.css tour.js)
+  config.assets.precompile += %w(login.css login.js reg_session.css tour.css tour.js gollum/editor/langs/*.js)
 end
 
 # require 'stub_xml_rpc'
diff --git a/db/schema.rb b/db/schema.rb
index 6d4c81e73..f40616a68 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -53,8 +53,8 @@ ActiveRecord::Schema.define(:version => 20120730214052) do
 
   create_table "arches", :force => true do |t|
     t.string   "name",       :null => false
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
   add_index "arches", ["name"], :name => "index_arches_on_name", :unique => true
@@ -63,8 +63,8 @@ ActiveRecord::Schema.define(:version => 20120730214052) do
     t.integer  "user_id"
     t.string   "provider"
     t.string   "uid"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
   add_index "authentications", ["provider", "uid"], :name => "index_authentications_on_provider_and_uid", :unique => true
@@ -75,8 +75,8 @@ ActiveRecord::Schema.define(:version => 20120730214052) do
     t.integer  "level"
     t.integer  "status"
     t.integer  "build_list_id"
-    t.datetime "created_at",    :null => false
-    t.datetime "updated_at",    :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.string   "version"
   end
 
@@ -106,8 +106,9 @@ ActiveRecord::Schema.define(:version => 20120730214052) do
     t.string   "project_version"
     t.integer  "project_id"
     t.integer  "arch_id"
-    t.datetime "created_at",                              :null => false
-    t.datetime "updated_at",                              :null => false
+    t.datetime "notified_at"
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.boolean  "is_circle",             :default => false
     t.text     "additional_repos"
     t.string   "name"
@@ -136,8 +137,8 @@ ActiveRecord::Schema.define(:version => 20120730214052) do
     t.string   "commentable_type"
     t.integer  "user_id"
     t.text     "body"
-    t.datetime "created_at",       :null => false
-    t.datetime "updated_at",       :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.decimal  "commentable_id",   :precision => 50, :scale => 0
     t.integer  "project_id"
   end
@@ -154,25 +155,23 @@ ActiveRecord::Schema.define(:version => 20120730214052) do
     t.string   "controller"
     t.string   "action"
     t.text     "message"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
   create_table "flash_notifies", :force => true do |t|
-    t.text     "body_ru",    :null => false
-    t.text     "body_en",    :null => false
-    t.string   "status",     :null => false
+    t.text     "body_ru",                      :null => false
+    t.text     "body_en",                      :null => false
+    t.string   "status",                       :null => false
     t.boolean  "published",  :default => true, :null => false
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
+    t.datetime "created_at",                   :null => false
+    t.datetime "updated_at",                   :null => false
   end
 
-  add_index "projects", ["owner_id"], :name => "index_projects_on_name_and_owner_id_and_owner_type", :unique => true, :case_sensitive => false
-
   create_table "groups", :force => true do |t|
     t.integer  "owner_id"
-    t.datetime "created_at",                        :null => false
-    t.datetime "updated_at",                        :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.string   "uname"
     t.integer  "own_projects_count", :default => 0, :null => false
     t.text     "description"
@@ -185,8 +184,8 @@ ActiveRecord::Schema.define(:version => 20120730214052) do
     t.string   "title"
     t.text     "body"
     t.string   "status",      :default => "open"
-    t.datetime "created_at",                        :null => false
-    t.datetime "updated_at",                        :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.integer  "user_id"
     t.datetime "closed_at"
     t.integer  "closed_by"
@@ -262,16 +261,16 @@ ActiveRecord::Schema.define(:version => 20120730214052) do
     t.integer  "platform_id"
     t.string   "login"
     t.string   "password"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.integer  "user_id"
   end
 
   create_table "product_build_lists", :force => true do |t|
     t.integer  "product_id"
     t.integer  "status",     :default => 2, :null => false
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
   add_index "product_build_lists", ["product_id"], :name => "index_product_build_lists_on_product_id"
@@ -279,8 +278,8 @@ ActiveRecord::Schema.define(:version => 20120730214052) do
   create_table "products", :force => true do |t|
     t.string   "name",                                :null => false
     t.integer  "platform_id",                         :null => false
-    t.datetime "created_at",                          :null => false
-    t.datetime "updated_at",                          :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.text     "build_script"
     t.text     "counter"
     t.text     "ks"
@@ -299,8 +298,8 @@ ActiveRecord::Schema.define(:version => 20120730214052) do
     t.string   "name"
     t.string   "version"
     t.datetime "file_mtime"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.integer  "platform_id"
   end
 
@@ -309,39 +308,41 @@ ActiveRecord::Schema.define(:version => 20120730214052) do
   create_table "project_to_repositories", :force => true do |t|
     t.integer  "project_id"
     t.integer  "repository_id"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
   create_table "projects", :force => true do |t|
     t.string   "name"
-    t.datetime "created_at",                              :null => false
-    t.datetime "updated_at",                              :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.integer  "owner_id"
     t.string   "owner_type"
     t.string   "visibility",         :default => "open"
     t.text     "description"
     t.string   "ancestry"
     t.boolean  "has_issues",         :default => true
-    t.boolean  "has_wiki",           :default => false
     t.string   "srpm_file_name"
     t.string   "srpm_content_type"
     t.integer  "srpm_file_size"
     t.datetime "srpm_updated_at"
+    t.boolean  "has_wiki",           :default => false
     t.string   "default_branch",     :default => "master"
     t.boolean  "is_package",         :default => true,     :null => false
     t.integer  "average_build_time", :default => 0,        :null => false
     t.integer  "build_count",        :default => 0,        :null => false
   end
 
+  add_index "projects", ["owner_id"], :name => "index_projects_on_name_and_owner_id_and_owner_type", :unique => true
+
   create_table "register_requests", :force => true do |t|
     t.string   "name"
     t.string   "email"
     t.string   "token"
     t.boolean  "approved",   :default => false
     t.boolean  "rejected",   :default => false
-    t.datetime "created_at",                    :null => false
-    t.datetime "updated_at",                    :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.string   "interest"
     t.text     "more"
   end
@@ -354,16 +355,16 @@ ActiveRecord::Schema.define(:version => 20120730214052) do
     t.string   "actor_type"
     t.integer  "target_id"
     t.string   "target_type"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.string   "role"
   end
 
   create_table "repositories", :force => true do |t|
     t.string   "description", :null => false
     t.integer  "platform_id", :null => false
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.string   "name",        :null => false
   end
 
@@ -374,8 +375,8 @@ ActiveRecord::Schema.define(:version => 20120730214052) do
     t.boolean  "new_comment_reply",             :default => true
     t.boolean  "new_issue",                     :default => true
     t.boolean  "issue_assign",                  :default => true
-    t.datetime "created_at",                                      :null => false
-    t.datetime "updated_at",                                      :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.boolean  "new_comment_commit_owner",      :default => true
     t.boolean  "new_comment_commit_repo_owner", :default => true
     t.boolean  "new_comment_commit_commentor",  :default => true
@@ -384,8 +385,8 @@ ActiveRecord::Schema.define(:version => 20120730214052) do
   create_table "subscribes", :force => true do |t|
     t.string   "subscribeable_type"
     t.integer  "user_id"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.boolean  "status",                                            :default => true
     t.integer  "project_id"
     t.decimal  "subscribeable_id",   :precision => 50, :scale => 0
@@ -395,19 +396,15 @@ ActiveRecord::Schema.define(:version => 20120730214052) do
     t.string   "name"
     t.string   "email",                                  :default => "",   :null => false
     t.string   "encrypted_password",      :limit => 128, :default => "",   :null => false
-    t.string   "password_salt",                          :default => "",   :null => false
     t.string   "reset_password_token"
     t.datetime "remember_created_at"
-    t.datetime "created_at",                                               :null => false
-    t.datetime "updated_at",                                               :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.string   "uname"
     t.string   "role"
     t.string   "language",                               :default => "en"
-    t.string   "confirmation_token"
-    t.datetime "confirmed_at"
-    t.datetime "confirmation_sent_at"
-    t.integer  "own_projects_count",                     :default => 0,    :null => false
     t.datetime "reset_password_sent_at"
+    t.integer  "own_projects_count",                     :default => 0,    :null => false
     t.text     "professional_experience"
     t.string   "site"
     t.string   "company"
@@ -419,6 +416,9 @@ ActiveRecord::Schema.define(:version => 20120730214052) do
     t.integer  "failed_attempts",                        :default => 0
     t.string   "unlock_token"
     t.datetime "locked_at"
+    t.string   "confirmation_token"
+    t.datetime "confirmed_at"
+    t.datetime "confirmation_sent_at"
     t.string   "authentication_token"
     t.integer  "build_priority",                         :default => 50
   end
diff --git a/lib/ext/git/grit.rb b/lib/ext/git/grit.rb
index 4fa2f11f3..3ec533062 100644
--- a/lib/ext/git/grit.rb
+++ b/lib/ext/git/grit.rb
@@ -7,7 +7,7 @@ module Grit
     MAX_DATA_SIZE = 50.megabytes
 
     def data_with_limit
-      size <= MAX_DATA_SIZE ? data_without_limit : nil # 'Error: blob is too big'
+      !huge? ? data_without_limit : nil # 'Error: blob is too big'
     end
     alias_method_chain :data, :limit
 
@@ -15,6 +15,10 @@ module Grit
       size.to_i > MAX_VIEW_SIZE
     end
 
+    def huge?
+      size.to_i > MAX_DATA_SIZE
+    end
+
     def render_as
       @render_as ||= case
       when large?; :binary
diff --git a/lib/modules/models/wiki.rb b/lib/modules/models/wiki.rb
index 1f13446b9..ef8884708 100644
--- a/lib/modules/models/wiki.rb
+++ b/lib/modules/models/wiki.rb
@@ -5,7 +5,7 @@ module Modules
       extend ActiveSupport::Concern
 
       included do
-        after_create :create_wiki
+        after_save :create_wiki
         after_destroy :destroy_wiki
       end
 
diff --git a/spec/controllers/projects/build_lists_controller_spec.rb b/spec/controllers/projects/build_lists_controller_spec.rb
index 0cb7e4b2f..b2aa0d17d 100644
--- a/spec/controllers/projects/build_lists_controller_spec.rb
+++ b/spec/controllers/projects/build_lists_controller_spec.rb
@@ -303,11 +303,11 @@ describe Projects::BuildListsController do
       assigns[:build_lists].should_not include(@build_list3)
     end
 
-    it 'should filter by project_name and start_date' do
+    it 'should filter by project_name and update_date' do
       get :index, :filter => {:project_name => @build_list3.project.name, :ownership => 'everything',
-                            "created_at_start(1i)" => @build_list3.created_at.year.to_s,
-                            "created_at_start(2i)" => @build_list3.created_at.month.to_s,
-                            "created_at_start(3i)" => @build_list3.created_at.day.to_s}
+                            "updated_at_start(1i)" => @build_list3.updated_at.year.to_s,
+                            "updated_at_start(2i)" => @build_list3.updated_at.month.to_s,
+                            "updated_at_start(3i)" => @build_list3.updated_at.day.to_s}
       assigns[:build_lists].should_not include(@build_list1)
       assigns[:build_lists].should_not include(@build_list2)
       assigns[:build_lists].should include(@build_list3)
diff --git a/vendor/assets/javascripts/gollum/editor/gollum.editor.js b/vendor/assets/javascripts/gollum/editor/gollum.editor.js
index 075887eab..f7ddc6012 100755
--- a/vendor/assets/javascripts/gollum/editor/gollum.editor.js
+++ b/vendor/assets/javascripts/gollum/editor/gollum.editor.js
@@ -241,7 +241,7 @@
       }
 
       // attempt to load the definition for this language
-      var script_uri = '/javascripts/gollum/editor/langs/' + markup_name + '.js';
+      var script_uri = '/assets/gollum/editor/langs/' + markup_name + '.js';
       $.ajax({
                 url: script_uri,
                 dataType: 'script',