aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/generators/resource_helpers.rb2
-rw-r--r--railties/test/application/bin_setup_test.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/resource_helpers.rb b/railties/lib/rails/generators/resource_helpers.rb
index 978b053308..e7cb722473 100644
--- a/railties/lib/rails/generators/resource_helpers.rb
+++ b/railties/lib/rails/generators/resource_helpers.rb
@@ -59,7 +59,7 @@ module Rails
end
# Loads the ORM::Generators::ActiveModel class. This class is responsible
- # to tell scaffold entities how to generate an specific method for the
+ # to tell scaffold entities how to generate a specific method for the
# ORM. Check Rails::Generators::ActiveModel for more information.
def orm_class
@orm_class ||= begin
diff --git a/railties/test/application/bin_setup_test.rb b/railties/test/application/bin_setup_test.rb
index 2f34e55a91..0fb995900f 100644
--- a/railties/test/application/bin_setup_test.rb
+++ b/railties/test/application/bin_setup_test.rb
@@ -40,7 +40,7 @@ module ApplicationTests
output = `bin/setup 2>&1`
# Ignore line that's only output by Bundler < 1.14
- output.sub! /^Resolving dependencies\.\.\.\n/, ""
+ output.sub!(/^Resolving dependencies\.\.\.\n/, "")
assert_equal(<<-OUTPUT, output)
== Installing dependencies ==