Index: app/controllers/application_controller.rb =================================================================== --- app/controllers/application_controller.rb (revision 18787) +++ app/controllers/application_controller.rb (working copy) @@ -486,7 +486,7 @@ if args.any? redirect_to *args elsif block_given? - block.call + yield else raise "#redirect_to_referer_or takes arguments or a block" end Index: lib/redmine/scm/adapters/abstract_adapter.rb =================================================================== --- lib/redmine/scm/adapters/abstract_adapter.rb (revision 18787) +++ lib/redmine/scm/adapters/abstract_adapter.rb (working copy) @@ -249,7 +249,7 @@ IO.popen(cmd, mode) do |io| io.set_encoding("ASCII-8BIT") if io.respond_to?(:set_encoding) io.close_write unless options[:write_stdin] - block.call(io) if block_given? + yield(io) if block_given? end rescue => e msg = strip_credential(e.message) Index: lib/redmine/views/builders.rb =================================================================== --- lib/redmine/views/builders.rb (revision 18787) +++ lib/redmine/views/builders.rb (working copy) @@ -32,7 +32,7 @@ raise "No builder for format #{format}" end if block - block.call(builder) + yield(builder) else builder end Index: lib/redmine/views/builders/structure.rb =================================================================== --- lib/redmine/views/builders/structure.rb (revision 18787) +++ lib/redmine/views/builders/structure.rb (working copy) @@ -32,7 +32,7 @@ def array(tag, options={}, &block) @struct << [] - block.call(self) + yield(self) ret = @struct.pop @struct.last[tag] = ret @struct.last.merge!(options) if options Index: test/functional/repositories_git_controller_test.rb =================================================================== --- test/functional/repositories_git_controller_test.rb (revision 18787) +++ test/functional/repositories_git_controller_test.rb (working copy) @@ -689,7 +689,7 @@ def with_cache(&block) before = ActionController::Base.perform_caching ActionController::Base.perform_caching = true - block.call + yield ActionController::Base.perform_caching = before end end Index: test/unit/lib/redmine/views/builders/json_test.rb =================================================================== --- test/unit/lib/redmine/views/builders/json_test.rb (revision 18787) +++ test/unit/lib/redmine/views/builders/json_test.rb (working copy) @@ -110,7 +110,7 @@ def assert_json_output(expected, &block) builder = Redmine::Views::Builders::Json.new(ActionDispatch::TestRequest.create, ActionDispatch::TestResponse.create) - block.call(builder) + yield(builder) assert_equal(expected, ActiveSupport::JSON.decode(builder.output)) end end Index: test/unit/lib/redmine/views/builders/xml_test.rb =================================================================== --- test/unit/lib/redmine/views/builders/xml_test.rb (revision 18787) +++ test/unit/lib/redmine/views/builders/xml_test.rb (working copy) @@ -63,7 +63,7 @@ def assert_xml_output(expected, &block) builder = Redmine::Views::Builders::Xml.new(ActionDispatch::TestRequest.create, ActionDispatch::TestResponse.create) - block.call(builder) + yield(builder) assert_equal('' + expected, builder.output) end end