Merge branch 'master' into karlhungus-mr-on-fork

Conflicts:
	app/contexts/filter_context.rb
	app/contexts/search_context.rb
	app/models/merge_request.rb
	app/models/note.rb
	app/views/shared/_merge_requests.html.haml
	spec/controllers/commit_controller_spec.rb
	spec/services/notification_service_spec.rb

2 files changed, 7 insertions, 1 deletions

diff --git a/db/migrate/20130804151314_add_st_diff_to_note.rb b/db/migrate/20130804151314_add_st_diff_to_note.rb
new file mode 100644
index 00000000000..3f9abb975c3
--- /dev/null
+++ b/db/migrate/20130804151314_add_st_diff_to_note.rb
@@ -0,0 +1,5 @@
+class AddStDiffToNote < ActiveRecord::Migration
+  def change
+    add_column :notes, :st_diff, :text, :null => true
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index e7940e2f724..f6e9ad54d07 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20130624162710) do
+ActiveRecord::Schema.define(:version => 20130804151314) do
 
   create_table "deploy_keys_projects", :force => true do |t|
     t.integer  "deploy_key_id", :null => false
@@ -148,6 +148,7 @@ ActiveRecord::Schema.define(:version => 20130624162710) do
     t.string   "line_code"
     t.string   "commit_id"
     t.integer  "noteable_id"
+    t.text     "st_diff"
   end
 
   add_index "notes", ["author_id"], :name => "index_notes_on_author_id"