From dd5b083f5d828c4bb51c4c6c3dbadbdbaf22193a Mon Sep 17 00:00:00 2001
From: Ronak Jangir <ronakjangir47@gmail.com>
Date: Mon, 28 Sep 2015 20:15:53 +0530
Subject: =?UTF-8?q?Renamed=20=E2=80=98Return=E2=80=99=20to=20=E2=80=98Retu?=
=?UTF-8?q?rns=E2=80=99=20[ci=20skip]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
railties/lib/rails/application.rb | 2 +-
railties/lib/rails/generators/base.rb | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
(limited to 'railties')
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index 8075068b3f..8b109c90b1 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -170,7 +170,7 @@ module Rails
routes_reloader.reload!
end
- # Return the application's KeyGenerator
+ # Returns the application's KeyGenerator
def key_generator
# number of iterations selected based on consultation with the google security
# team. Details at https://github.com/rails/rails/pull/6952#issuecomment-7661220
diff --git a/railties/lib/rails/generators/base.rb b/railties/lib/rails/generators/base.rb
index 6fa413f8b0..c72ec400a0 100644
--- a/railties/lib/rails/generators/base.rb
+++ b/railties/lib/rails/generators/base.rb
@@ -302,13 +302,13 @@ module Rails
default_for_option(Rails::Generators.options, name, options, options[:default])
end
- # Return default aliases for the option name given doing a lookup in
+ # Returns default aliases for the option name given doing a lookup in
# Rails::Generators.aliases.
def self.default_aliases_for_option(name, options)
default_for_option(Rails::Generators.aliases, name, options, options[:aliases])
end
- # Return default for the option name given doing a lookup in config.
+ # Returns default for the option name given doing a lookup in config.
def self.default_for_option(config, name, options, default)
if generator_name and c = config[generator_name.to_sym] and c.key?(name)
c[name]
--
cgit v1.2.3