diff options
8 files changed, 30 insertions, 30 deletions
diff --git a/actioncable/test/stubs/test_server.rb b/actioncable/test/stubs/test_server.rb index 71819a43dc..b64ff33789 100644 --- a/actioncable/test/stubs/test_server.rb +++ b/actioncable/test/stubs/test_server.rb @@ -13,9 +13,9 @@ class TestServer @config.use_faye = ENV["FAYE"].present? @config.client_socket_class = if @config.use_faye ActionCable::Connection::FayeClientSocket - else - ActionCable::Connection::ClientSocket - end + else + ActionCable::Connection::ClientSocket + end @mutex = Monitor.new end @@ -27,9 +27,9 @@ class TestServer def event_loop @event_loop ||= if @config.use_faye ActionCable::Connection::FayeEventLoop.new - else - ActionCable::Connection::StreamEventLoop.new - end + else + ActionCable::Connection::StreamEventLoop.new + end end def worker_pool diff --git a/actionmailer/lib/rails/generators/mailer/mailer_generator.rb b/actionmailer/lib/rails/generators/mailer/mailer_generator.rb index 72e53fb993..9dd7ee7a27 100644 --- a/actionmailer/lib/rails/generators/mailer/mailer_generator.rb +++ b/actionmailer/lib/rails/generators/mailer/mailer_generator.rb @@ -28,9 +28,9 @@ module Rails def application_mailer_file_name @_application_mailer_file_name ||= if mountable_engine? "app/mailers/#{namespaced_path}/application_mailer.rb" - else - "app/mailers/application_mailer.rb" - end + else + "app/mailers/application_mailer.rb" + end end end end diff --git a/actionpack/lib/action_controller/metal/implicit_render.rb b/actionpack/lib/action_controller/metal/implicit_render.rb index 9332da5721..c414527d63 100644 --- a/actionpack/lib/action_controller/metal/implicit_render.rb +++ b/actionpack/lib/action_controller/metal/implicit_render.rb @@ -61,7 +61,7 @@ module ActionController def method_for_action(action_name) super || if template_exists?(action_name.to_s, _prefixes) - "default_render" + "default_render" end end diff --git a/actionpack/lib/action_dispatch/journey/parser.rb b/actionpack/lib/action_dispatch/journey/parser.rb index 91fef7e96f..7ec9d63859 100644 --- a/actionpack/lib/action_dispatch/journey/parser.rb +++ b/actionpack/lib/action_dispatch/journey/parser.rb @@ -192,5 +192,5 @@ module ActionDispatch val[0] end end # class Parser - end # module Journey - end # module ActionDispatch + end # module Journey +end # module ActionDispatch diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb index a6b177480d..abbf6b06b6 100644 --- a/actionpack/lib/action_dispatch/routing/mapper.rb +++ b/actionpack/lib/action_dispatch/routing/mapper.rb @@ -1685,9 +1685,9 @@ to this: as = if !options.fetch(:as, true) # if it's set to nil or false options.delete(:as) - else - name_for_action(options.delete(:as), action) - end + else + name_for_action(options.delete(:as), action) + end path = Mapping.normalize_path URI.parser.escape(path), formatted ast = Journey::Parser.parse path diff --git a/actionpack/lib/action_dispatch/routing/polymorphic_routes.rb b/actionpack/lib/action_dispatch/routing/polymorphic_routes.rb index eb96466aa5..4f1aaeefc8 100644 --- a/actionpack/lib/action_dispatch/routing/polymorphic_routes.rb +++ b/actionpack/lib/action_dispatch/routing/polymorphic_routes.rb @@ -248,9 +248,9 @@ module ActionDispatch named_route = if model.persisted? args << model get_method_for_string model.model_name.singular_route_key - else - get_method_for_class model - end + else + get_method_for_class model + end [named_route, args] end diff --git a/actionview/lib/action_view/helpers/form_helper.rb b/actionview/lib/action_view/helpers/form_helper.rb index f470375988..7d574f0a14 100644 --- a/actionview/lib/action_view/helpers/form_helper.rb +++ b/actionview/lib/action_view/helpers/form_helper.rb @@ -468,9 +468,9 @@ module ActionView options[:url] ||= if options.key?(:format) polymorphic_path(record, format: options.delete(:format)) - else - polymorphic_path(record, {}) - end + else + polymorphic_path(record, {}) + end end private :apply_form_for_options! @@ -1574,12 +1574,12 @@ module ActionView record_name = if index "#{object_name}[#{index}][#{record_name}]" - elsif record_name.to_s.end_with?("[]") - record_name = record_name.to_s.sub(/(.*)\[\]$/, "[\\1][#{record_object.id}]") - "#{object_name}#{record_name}" - else - "#{object_name}[#{record_name}]" - end + elsif record_name.to_s.end_with?("[]") + record_name = record_name.to_s.sub(/(.*)\[\]$/, "[\\1][#{record_object.id}]") + "#{object_name}#{record_name}" + else + "#{object_name}[#{record_name}]" + end fields_options[:child_index] = index @template.fields_for(record_name, record_object, fields_options, &block) diff --git a/activerecord/lib/active_record/core.rb b/activerecord/lib/active_record/core.rb index d3fe962802..cb11cdefd9 100644 --- a/activerecord/lib/active_record/core.rb +++ b/activerecord/lib/active_record/core.rb @@ -503,9 +503,9 @@ module ActiveRecord "#{name}: #{attribute_for_inspect(name)}" end end.compact.join(", ") - else - "not initialized" - end + else + "not initialized" + end "#<#{self.class} #{inspection}>" end |