diff --git a/Gemfile.lock b/Gemfile.lock index 1cef84812e..3a8036b575 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -477,7 +477,7 @@ GEM sprockets (>= 3.0.0) sshkey (2.0.0) stackprof (0.2.23) - syntax_tree (6.0.0) + syntax_tree (6.0.1) prettier_print (>= 1.2.0) syntax_tree-disable_ternary (1.0.0) test-prof (1.2.0) diff --git a/lib/email/receiver.rb b/lib/email/receiver.rb index 2dcf33f847..73d468e4ac 100644 --- a/lib/email/receiver.rb +++ b/lib/email/receiver.rb @@ -1510,7 +1510,8 @@ module Email def self.elided_html(elided) html = +"\n\n" << "
" << "\n" - html << "···" << "\n\n" + html << "···" << + "\n\n" html << elided << "\n\n" html << "
" << "\n" html diff --git a/lib/topic_query.rb b/lib/topic_query.rb index b01bbca0cf..7c364e53d6 100644 --- a/lib/topic_query.rb +++ b/lib/topic_query.rb @@ -455,7 +455,8 @@ class TopicQuery if options[:preload_posters] user_ids = [] topics.each do |ft| - user_ids << ft.user_id << ft.last_post_user_id << ft.featured_user_ids << ft.allowed_user_ids + user_ids << ft.user_id << ft.last_post_user_id << ft.featured_user_ids << + ft.allowed_user_ids end user_lookup = UserLookup.new(user_ids) diff --git a/script/import_scripts/phpbb3/importers/poll_importer.rb b/script/import_scripts/phpbb3/importers/poll_importer.rb index df4696201c..5f86247bb4 100644 --- a/script/import_scripts/phpbb3/importers/poll_importer.rb +++ b/script/import_scripts/phpbb3/importers/poll_importer.rb @@ -74,7 +74,8 @@ module ImportScripts::PhpBB3 arguments << "close=#{poll_data.close_time.iso8601}" if poll_data.close_time if poll_data.max_options > 1 - arguments << "type=multiple" << "max=#{[poll_data.max_options, poll_data.options.count].min}" + arguments << "type=multiple" << + "max=#{[poll_data.max_options, poll_data.options.count].min}" else arguments << "type=regular" end