summaryrefslogtreecommitdiffstats
path: root/db/migrate/101_populate_changesets_user_id.rb
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2014-10-22 17:37:16 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2014-10-22 17:37:16 +0000
commit2d1866d966d94c688f9cb87c5bf3f096dffac844 (patch)
tree7a733c1cc51448ab69b3f892285305dbfb0ae15e /db/migrate/101_populate_changesets_user_id.rb
parenta6ec78a4dc658e3517ed682792016b6530458696 (diff)
downloadredmine-2d1866d966d94c688f9cb87c5bf3f096dffac844.tar.gz
redmine-2d1866d966d94c688f9cb87c5bf3f096dffac844.zip
Merged rails-4.1 branch (#14534).
git-svn-id: http://svn.redmine.org/redmine/trunk@13482 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'db/migrate/101_populate_changesets_user_id.rb')
-rw-r--r--db/migrate/101_populate_changesets_user_id.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/db/migrate/101_populate_changesets_user_id.rb b/db/migrate/101_populate_changesets_user_id.rb
index dd493d17d..566363f7c 100644
--- a/db/migrate/101_populate_changesets_user_id.rb
+++ b/db/migrate/101_populate_changesets_user_id.rb
@@ -7,7 +7,7 @@ class PopulateChangesetsUserId < ActiveRecord::Migration
username, email = $1.strip, $3
u = User.find_by_login(username)
u ||= User.find_by_mail(email) unless email.blank?
- Changeset.update_all("user_id = #{u.id}", ["committer = ?", committer]) unless u.nil?
+ Changeset.where(["committer = ?", committer]).update_all("user_id = #{u.id}") unless u.nil?
end
end
end