IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-16 18:24:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

DEV: Update syntax_tree to 6.0.1 (#20466)

Browse Source
This commit is contained in:
Jarek Radosz 2023-02-27 17:20:00 +01:00 committed by GitHub
parent bc4e016b49
commit f63d18d6ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile.lock
View File

@ -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)

3
lib/email/receiver.rb
View File

@ -1510,7 +1510,8 @@ module Email
def self.elided_html(elided)
html = +"\n\n" << "<details class='elided'>" << "\n"
html << "<summary title='#{I18n.t("emails.incoming.show_trimmed_content")}'>&#183;&#183;&#183;</summary>" << "\n\n"
html << "<summary title='#{I18n.t("emails.incoming.show_trimmed_content")}'>&#183;&#183;&#183;</summary>" <<
"\n\n"
html << elided << "\n\n"
html << "</details>" << "\n"
html

3
lib/topic_query.rb
View File

@ -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)

3
script/import_scripts/phpbb3/importers/poll_importer.rb
View File

@ -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