aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2013-09-01 16:33:44 -0300
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2013-09-01 16:46:18 -0300
commitdfd7454683c0222bdb741753b76e8d68f5e73aef (patch)
treed181aa5ff11758e7fe5be7a29c125e975ca46c44 /activerecord/lib/active_record
parent69c5e010dcff0545fb2f38672e28894f230b1338 (diff)
downloadrails-dfd7454683c0222bdb741753b76e8d68f5e73aef.tar.gz
rails-dfd7454683c0222bdb741753b76e8d68f5e73aef.tar.bz2
rails-dfd7454683c0222bdb741753b76e8d68f5e73aef.zip
Remove useless comment and white spaces :scissors: [ci skip]
Diffstat (limited to 'activerecord/lib/active_record')
-rw-r--r--activerecord/lib/active_record/associations/belongs_to_association.rb4
-rw-r--r--activerecord/lib/active_record/associations/singular_association.rb1
2 files changed, 2 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/associations/belongs_to_association.rb b/activerecord/lib/active_record/associations/belongs_to_association.rb
index 8eec4f56af..e1fa5225b5 100644
--- a/activerecord/lib/active_record/associations/belongs_to_association.rb
+++ b/activerecord/lib/active_record/associations/belongs_to_association.rb
@@ -50,8 +50,8 @@ module ActiveRecord
# Checks whether record is different to the current target, without loading it
def different_target?(record)
- if record.nil?
- owner[reflection.foreign_key]
+ if record.nil?
+ owner[reflection.foreign_key]
else
record.id != owner[reflection.foreign_key]
end
diff --git a/activerecord/lib/active_record/associations/singular_association.rb b/activerecord/lib/active_record/associations/singular_association.rb
index 10238555f0..02dc464536 100644
--- a/activerecord/lib/active_record/associations/singular_association.rb
+++ b/activerecord/lib/active_record/associations/singular_association.rb
@@ -42,7 +42,6 @@ module ActiveRecord
scope.first.tap { |record| set_inverse_instance(record) }
end
- # Implemented by subclasses
def replace(record)
raise NotImplementedError, "Subclasses must implement a replace(record) method"
end