diff options
| -rw-r--r-- | activerecord/test/cases/autosave_association_test.rb | 2 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/public/javascripts/jquery.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/test/cases/autosave_association_test.rb b/activerecord/test/cases/autosave_association_test.rb index ca59b3d6de..dbc5d71153 100644 --- a/activerecord/test/cases/autosave_association_test.rb +++ b/activerecord/test/cases/autosave_association_test.rb @@ -743,7 +743,7 @@ class TestDestroyAsPartOfAutosaveAssociation < ActiveRecord::TestCase 2.times { |i| @pirate.birds.create!(:name => "birds_#{i}") } before = @pirate.birds.map { |c| c.mark_for_destruction ; c } - # Stub the destroy method of the the second child to raise an exception + # Stub the destroy method of the second child to raise an exception class << before.last def destroy(*args) super diff --git a/railties/lib/rails/generators/rails/app/templates/public/javascripts/jquery.js b/railties/lib/rails/generators/rails/app/templates/public/javascripts/jquery.js index 5c99a8d4a8..aa3a4f34fd 100644 --- a/railties/lib/rails/generators/rails/app/templates/public/javascripts/jquery.js +++ b/railties/lib/rails/generators/rails/app/templates/public/javascripts/jquery.js @@ -2136,7 +2136,7 @@ jQuery.event = { eventHandle = elemData.handle; if ( typeof events === "function" ) { - // On plain objects events is a fn that holds the the data + // On plain objects events is a fn that holds the data // which prevents this data from being JSON serialized // the function does not need to be called, it just contains the data eventHandle = events.handle; |