diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2010-11-14 16:24:21 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2010-11-14 16:24:21 +0000 |
| commit | 2ee45e8cac909991ddf782a8d2947ae99473404a (patch) | |
| tree | 48456af96778489fcc65f77c347140adf206d66a /vendor | |
| parent | c4a218358f499b6252874b8260ffa475fd7be3d7 (diff) | |
| download | redmine-2ee45e8cac909991ddf782a8d2947ae99473404a.tar.gz redmine-2ee45e8cac909991ddf782a8d2947ae99473404a.zip | |
Use Object#tap instead of #returning (#6887).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4406 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'vendor')
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? |