merge upstream/master and resolve conflicts from https://github.com/openstreetmap...

[rails.git] / app / models / way.rb

diff --git a/app/models/way.rb b/app/models/way.rb
index b31ffc1d16a7b38d4064e811194f05361fb13b96..ecbdd2f9ccd054ab4120fe7f627afb0c93f14e5c 100644 (file)
--- a/app/models/way.rb
+++ b/app/models/way.rb
@@ -222,7 +222,7 @@ class Way < ActiveRecord::Base
       lock!
       check_consistency(self, new_way, user)
       rels = Relation.joins(:relation_members).where(:visible => true, :current_relation_members => { :member_type => "Way", :member_id => id }).order(:id)
-      raise OSM::APIPreconditionFailedError.new("Way #{id} is still used by relations #{rels.collect(&:id).join(",")}.") unless rels.empty?
+      raise OSM::APIPreconditionFailedError.new("Way #{id} is still used by relations #{rels.collect(&:id).join(',')}.") unless rels.empty?
 
       self.changeset_id = new_way.changeset_id
       self.changeset = new_way.changeset