summaryrefslogtreecommitdiffstats
path: root/vendor
diff options
context:
space:
mode:
Diffstat (limited to 'vendor')
-rw-r--r--vendor/plugins/awesome_nested_set/lib/awesome_nested_set.rb2
-rw-r--r--vendor/plugins/engines/generators/plugin_migration/plugin_migration_generator.rb2
-rw-r--r--vendor/plugins/gravatar/lib/gravatar.rb2
3 files changed, 3 insertions, 3 deletions
diff --git a/vendor/plugins/awesome_nested_set/lib/awesome_nested_set.rb b/vendor/plugins/awesome_nested_set/lib/awesome_nested_set.rb
index 9c4ee0f22..0229a8e5c 100644
--- a/vendor/plugins/awesome_nested_set/lib/awesome_nested_set.rb
+++ b/vendor/plugins/awesome_nested_set/lib/awesome_nested_set.rb
@@ -154,7 +154,7 @@ module CollectiveIdea #:nodoc:
def each_root_valid?(roots_to_validate)
left = right = 0
roots_to_validate.all? do |root|
- returning(root.left > left && root.right > right) do
+ (root.left > left && root.right > right).tap do
left = root.left
right = root.right
end
diff --git a/vendor/plugins/engines/generators/plugin_migration/plugin_migration_generator.rb b/vendor/plugins/engines/generators/plugin_migration/plugin_migration_generator.rb
index d6ecbd489..900dc056b 100644
--- a/vendor/plugins/engines/generators/plugin_migration/plugin_migration_generator.rb
+++ b/vendor/plugins/engines/generators/plugin_migration/plugin_migration_generator.rb
@@ -76,7 +76,7 @@ class PluginMigrationGenerator < Rails::Generator::Base
# plugin names involved is shorter than 230 characters that one will be
# used. Otherwise a shorter name will be returned.
def build_migration_name
- returning descriptive_migration_name do |name|
+ descriptive_migration_name.tap do |name|
name.replace short_migration_name if name.length > MAX_FILENAME_LENGTH
end
end
diff --git a/vendor/plugins/gravatar/lib/gravatar.rb b/vendor/plugins/gravatar/lib/gravatar.rb
index 9af1fed16..c1b62c584 100644
--- a/vendor/plugins/gravatar/lib/gravatar.rb
+++ b/vendor/plugins/gravatar/lib/gravatar.rb
@@ -71,7 +71,7 @@ module GravatarHelper
email_hash = Digest::MD5.hexdigest(email)
options = DEFAULT_OPTIONS.merge(options)
options[:default] = CGI::escape(options[:default]) unless options[:default].nil?
- returning gravatar_api_url(email_hash, options.delete(:ssl)) do |url|
+ gravatar_api_url(email_hash, options.delete(:ssl)).tap do |url|
opts = []
[:rating, :size, :default].each do |opt|
unless options[opt].nil?