summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorIzaak Alpert <ialpert@blackberry.com>2013-07-16 17:14:03 -0400
committerIzaak Alpert <ialpert@blackberry.com>2013-07-17 22:48:03 -0400
commitd99594273d57b2d5ed7c748b3185712960b89478 (patch)
tree5f5d6da6011465e3521c7c3ab09ec7a38dbef37a /db
parent128f2845770b7a6d553ee764cdbbe63da5ba9e84 (diff)
downloadgitlab-ce-d99594273d57b2d5ed7c748b3185712960b89478.tar.gz
Style changes from review with @randx
-Some changes around calling origional methods for !for_fork? merge requests. Other changes to follow Change-Id: I009c716ce2475b9efa3fd07aee9215fca7a1c150
Diffstat (limited to 'db')
-rw-r--r--db/migrate/20130419190306_allow_merges_for_forks.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/db/migrate/20130419190306_allow_merges_for_forks.rb b/db/migrate/20130419190306_allow_merges_for_forks.rb
index 92736543971..13135cbafcf 100644
--- a/db/migrate/20130419190306_allow_merges_for_forks.rb
+++ b/db/migrate/20130419190306_allow_merges_for_forks.rb
@@ -2,7 +2,7 @@ class AllowMergesForForks < ActiveRecord::Migration
def self.up
add_column :merge_requests, :target_project_id, :integer, :null => false
- MergeRequest.connection.execute("update merge_requests set target_project_id=project_id")
+ MergeRequest.update_all("target_project_id = project_id")
rename_column :merge_requests, :project_id, :source_project_id
end