- <%= raw t(".prompt", client_name: content_tag(:strong, class: "text-info") { @pre_auth.client.name }) %> + <%= raw t(".prompt", client_name: tag.strong(class: "text-info") { @pre_auth.client.name }) %>

<% if @pre_auth.scopes.count > 0 %> diff --git a/app/views/internal/configs/show.html.erb b/app/views/internal/configs/show.html.erb index 37b900ea9..3c13f9176 100644 --- a/app/views/internal/configs/show.html.erb +++ b/app/views/internal/configs/show.html.erb @@ -11,7 +11,6 @@ -
-
+
p-3" aria-labelledby="siteConfigHeader"> <%= form_for(SiteConfig.new, url: internal_config_path) do |f| %> <% VerifySetupCompleted::MANDATORY_CONFIGS.each do |config_key| %> <% if SiteConfig.public_send(config_key).is_a?(Hash) %> - <%= internal_config_label "#{config_key.to_s}" %> + <%= internal_config_label config_key.to_s %>
<%= f.fields_for config_key do |a_field| %> <% SiteConfig.public_send(config_key).each do |key, value| %>
- <%= internal_config_label "#{key}" %> + <%= internal_config_label key.to_s %> <%= a_field.text_field key, class: "form-control", value: SiteConfig.public_send(config_key)[key], placeholder: Constants::SITE_CONFIG_DETAILS[config_key][:placeholder] %> -
<%= "#{key} #{config_key.to_s.gsub! '_', ' '}" %>
+
<%= "#{key} #{config_key.to_s.tr! '_', ' '}" %>
<% end %> <% end %> @@ -77,7 +76,6 @@
-
-
Price for small credit purchase (< 10 credits).
-
-
+
Price for small credit purchase (<10 credits).
<%= price_field.label "Credit price in cents (M)" %> <%= price_field.number_field :medium, class: "form-control", - value: SiteConfig.credit_prices_in_cents[:medium] %> + value: SiteConfig.credit_prices_in_cents[:medium] %>
Price for medium credit purchase (10 - 99 credits).
@@ -290,7 +286,7 @@ <% end %>
- +
<%= render partial: "card_header", locals: { @@ -366,12 +362,12 @@ class: "form-control", value: SiteConfig.jobs_url, placeholder: Constants::SITE_CONFIG_DETAILS[:jobs_url][:placeholder] %> -
<%=Constants::SITE_CONFIG_DETAILS[:jobs_url][:description] %>
+
<%= Constants::SITE_CONFIG_DETAILS[:jobs_url][:description] %>
<%= internal_config_label :display_jobs_banner %> <%= f.check_box :display_jobs_banner, checked: SiteConfig.display_jobs_banner %> -
<%=Constants::SITE_CONFIG_DETAILS[:display_jobs_banner][:description] %>
+
<%= Constants::SITE_CONFIG_DETAILS[:display_jobs_banner][:description] %>
@@ -390,7 +386,7 @@ <%= f.text_field :ga_view_id, class: "form-control", value: SiteConfig.ga_view_id %> -
<%=Constants::SITE_CONFIG_DETAILS[:ga_view_id][:description] %>
+
<%= Constants::SITE_CONFIG_DETAILS[:ga_view_id][:description] %>
@@ -400,7 +396,7 @@ value: SiteConfig.ga_fetch_rate, min: 1, placeholder: Constants::SITE_CONFIG_DETAILS[:ga_fetch_rate][:placeholder] %> -
<%=Constants::SITE_CONFIG_DETAILS[:ga_fetch_rate][:description] %>
+
<%= Constants::SITE_CONFIG_DETAILS[:ga_fetch_rate][:description] %>
@@ -682,7 +678,7 @@ <%= f.text_field :onboarding_background_image, class: "form-control", value: SiteConfig.onboarding_background_image, - placeholder: Constants::SITE_CONFIG_DETAILS[:onboarding_background_image][:placeholder] %> + placeholder: Constants::SITE_CONFIG_DETAILS[:onboarding_background_image][:placeholder] %>
main social image diff --git a/app/views/internal/feedback_messages/index.html.erb b/app/views/internal/feedback_messages/index.html.erb index b543bd327..d4f724eff 100644 --- a/app/views/internal/feedback_messages/index.html.erb +++ b/app/views/internal/feedback_messages/index.html.erb @@ -22,9 +22,9 @@ <% end %>
- <%= content_tag :span, sort_link(@q, :reporter_username, "Reporter"), class: "mx-2" %> - <%= content_tag :span, sort_link(@q, :reported_url, "Reported URL"), class: "mx-2" %> - <%= content_tag :span, sort_link(@q, :created_at, "Creation Date"), class: "ml-2" %> + <%= tag.span(sort_link(@q, :reporter_username, "Reporter"), class: "mx-2") %> + <%= tag.span(sort_link(@q, :reported_url, "Reported URL"), class: "mx-2") %> + <%= tag.span(sort_link(@q, :created_at, "Creation Date"), class: "ml-2") %>
<%= paginate @feedback_messages %> diff --git a/app/views/internal/moderator_actions/index.html.erb b/app/views/internal/moderator_actions/index.html.erb index 126f2e736..a38f2e47d 100644 --- a/app/views/internal/moderator_actions/index.html.erb +++ b/app/views/internal/moderator_actions/index.html.erb @@ -22,7 +22,7 @@ Action Data - <%= content_tag :span, sort_link(@q, :created_at, "Date"), class: "mx-2" %> + <%= tag.span(sort_link(@q, :created_at, "Date"), class: "mx-2") %> diff --git a/app/views/internal/users/_credits.erb b/app/views/internal/users/_credits.erb index 38394c905..2e404a010 100644 --- a/app/views/internal/users/_credits.erb +++ b/app/views/internal/users/_credits.erb @@ -7,7 +7,7 @@

Available User Credits: <%= current_credits %>

<%= form_with scope: :user, url: internal_user_path(@user), method: :patch, local: true, html: { class: "form-inline justify-content-between mb-2" } do |f| %>
- <%= f.number_field :add_credits, in: 1...10000, required: true, class: "form-control mr-3", size: 5 %> + <%= f.number_field :add_credits, in: 1...10_000, required: true, class: "form-control mr-3", size: 5 %> <%= f.text_field :new_note, placeholder: "Why are you adding these credits?", size: 50, required: true, class: "form-control" %>
<%= f.submit "Add Credits", class: "btn btn-primary" %> @@ -28,17 +28,17 @@

Organizations

<%= form_with scope: :user, url: internal_user_path(@user), method: :patch, local: true, html: { class: "form-inline justify-content-between mb-2" } do |f| %>
- <%= f.number_field :add_org_credits, in: 1...10000, required: true, class: "form-control mr-3", size: 5 %> + <%= f.number_field :add_org_credits, in: 1...10_000, required: true, class: "form-control mr-3", size: 5 %> <%= f.text_field :new_note, placeholder: "Why are you adding these credits?", size: 50, required: true, class: "form-control mr-3" %> - <%= f.select :organization_id, orgs_with_credits(@organizations), {}, { class: 'form-control' } %> + <%= f.select :organization_id, orgs_with_credits(@organizations), {}, { class: "form-control" } %>
<%= f.submit "Add Org Credits", class: "btn btn-primary" %> - <% end %> + <% end %> <%= form_with scope: :user, url: internal_user_path(@user), method: :patch, local: true, html: { class: "form-inline justify-content-between mb-2" } do |f| %>
- <%= f.number_field :remove_org_credits, in: 1...10000, required: true, class: "form-control mr-3", size: 5 %> + <%= f.number_field :remove_org_credits, in: 1...10_000, required: true, class: "form-control mr-3", size: 5 %> <%= f.text_field :new_note, placeholder: "Why are you removing these credits?", size: 50, required: true, class: "form-control mr-3" %> - <%= f.select :organization_id, orgs_with_credits(@organizations), {}, { class: 'form-control' } %> + <%= f.select :organization_id, orgs_with_credits(@organizations), {}, { class: "form-control" } %>
<%= f.submit "Remove Org Credits", class: "btn btn-danger" %> <% end %> diff --git a/app/views/internal/users/_notes.erb b/app/views/internal/users/_notes.erb index e6df53fdd..f8b6b798d 100644 --- a/app/views/internal/users/_notes.erb +++ b/app/views/internal/users/_notes.erb @@ -7,7 +7,7 @@

<%= note.created_at.strftime("%d %B %Y %H:%M UTC") %> by <%= User.find(note.author_id).username if note.author_id.present? %> - - + - <% unless note.reason.blank? %> <%= note.reason %>: <% end %> diff --git a/app/views/kaminari/internal/_page.html.erb b/app/views/kaminari/internal/_page.html.erb index 98db18a59..3919fbe5d 100644 --- a/app/views/kaminari/internal/_page.html.erb +++ b/app/views/kaminari/internal/_page.html.erb @@ -1,6 +1,6 @@ <% if page.current? %>

  • - <%= content_tag :a, page, data: { remote: remote }, rel: page.rel, class: "page-link" %> + <%= tag.a(page, data: { remote: remote }, rel: page.rel, class: "page-link") %>
    • <% else %>
  • diff --git a/app/views/listings/index.html.erb b/app/views/listings/index.html.erb index dc0a1c7e0..473184a12 100644 --- a/app/views/listings/index.html.erb +++ b/app/views/listings/index.html.erb @@ -40,8 +40,7 @@ data-allcategories="<%= categories_for_display.to_json %>" <% if @displayed_listing %> data-displayedlisting="<%= @displayed_listing_json %> " - <% end %> -> + <% end %>>
    • <%= javascript_packs_with_chunks_tag "listings", defer: true %> diff --git a/app/views/mailers/notify_mailer/account_deletion_requested_email.txt.erb b/app/views/mailers/notify_mailer/account_deletion_requested_email.text.erb similarity index 90% rename from app/views/mailers/notify_mailer/account_deletion_requested_email.txt.erb rename to app/views/mailers/notify_mailer/account_deletion_requested_email.text.erb index 9cebd50c4..f694ac915 100644 --- a/app/views/mailers/notify_mailer/account_deletion_requested_email.txt.erb +++ b/app/views/mailers/notify_mailer/account_deletion_requested_email.text.erb @@ -3,4 +3,4 @@ Your account deletion was requested. Please, visit this page: <%= user_request_d Contact us at <%= SiteConfig.email_addresses[:default] %> if there is anything more we can help with. Thanks, -The <%= community_name %> Team \ No newline at end of file +The <%= community_name %> Team diff --git a/app/views/mailers/notify_mailer/channel_invite_email.text.erb b/app/views/mailers/notify_mailer/channel_invite_email.text.erb index ab445ea36..66c150ee9 100644 --- a/app/views/mailers/notify_mailer/channel_invite_email.text.erb +++ b/app/views/mailers/notify_mailer/channel_invite_email.text.erb @@ -1,3 +1,3 @@ You are invited to the <%= community_name %> Connect channel <%= @membership.chat_channel.channel_name %> -View Invitation: <%= ApplicationController.helpers.app_url('connect') %> +View Invitation: <%= ApplicationController.helpers.app_url("connect") %> diff --git a/app/views/mailers/notify_mailer/feedback_message_resolution_email.text.erb b/app/views/mailers/notify_mailer/feedback_message_resolution_email.text.erb index bf1c04f85..90ef1c329 100644 --- a/app/views/mailers/notify_mailer/feedback_message_resolution_email.text.erb +++ b/app/views/mailers/notify_mailer/feedback_message_resolution_email.text.erb @@ -1 +1 @@ -<%= @email_body %> \ No newline at end of file +<%= @email_body %> diff --git a/app/views/mailers/notify_mailer/tag_moderator_confirmation_email.text.erb b/app/views/mailers/notify_mailer/tag_moderator_confirmation_email.text.erb index bb2af020a..06d905cf1 100644 --- a/app/views/mailers/notify_mailer/tag_moderator_confirmation_email.text.erb +++ b/app/views/mailers/notify_mailer/tag_moderator_confirmation_email.text.erb @@ -15,9 +15,12 @@ To aid in communication, we’ve added you to the following <%= community_name % - Tag Moderators <%= app_url("/connect/tag-moderators") %> - #<%= @tag %> -You can use these channels to meet other tag moderators across the site and co-moderators within your tag while coordinating with the <%= community_name %> team. When in doubt about how to exercise your new privileges, please ask! If these Connect channels become too distracting, you can mute or leave any channel as you wish. +You can use these channels to meet other tag moderators across the site and co-moderators within your tag while coordinating with the <%= community_name %> team. +When in doubt about how to exercise your new privileges, please ask! If these Connect channels become too distracting, you can mute or leave any channel as you wish. -Tag moderation is something we're continuously iterating on, so you can expect adjustments and expanding features over time as we receive feedback. We regularly send out a biweekly Mod Newsletter to keep mods up to date on these changes, so look out for it! Of course, don't hesitate to reach out to us at any moment if you have any feedback — feel free to write to <%= SiteConfig.email_addresses[:default] %> and share your thoughts. +Tag moderation is something we're continuously iterating on, so you can expect adjustments and expanding features over time as we receive feedback. +We regularly send out a biweekly Mod Newsletter to keep mods up to date on these changes, so look out for it! +Of course, don't hesitate to reach out to us at any moment if you have any feedback — feel free to write to <%= SiteConfig.email_addresses[:default] %> and share your thoughts. Thanks so much for volunteering your time to benefit the <%= community_qualified_name %>. We sincerely appreciate your help! diff --git a/app/views/notifications/_broadcast.html.erb b/app/views/notifications/_broadcast.html.erb index a41b9a5e1..edb866a09 100644 --- a/app/views/notifications/_broadcast.html.erb +++ b/app/views/notifications/_broadcast.html.erb @@ -6,7 +6,7 @@ link to <%= json_data['s profile">
    -
    +
    "> <%= json_data["broadcast"]["processed_html"].html_safe %> <% if notification.json_data['broadcast']['type_of'] == "Welcome" %> diff --git a/app/views/onboardings/show.html.erb b/app/views/onboardings/show.html.erb index 2c3072df3..f0718ad32 100644 --- a/app/views/onboardings/show.html.erb +++ b/app/views/onboardings/show.html.erb @@ -16,8 +16,7 @@ data-community-name="<%= community_name %>" data-community-description="<%= SiteConfig.community_description %>" data-community-logo="<%= cloudinary safe_logo_url(SiteConfig.onboarding_logo_image) %>" - data-community-background="<%= cloudinary(SiteConfig.onboarding_background_image, "1680", 75) %>" -> + data-community-background="<%= cloudinary(SiteConfig.onboarding_background_image, "1680", 75) %>"> <%= javascript_packs_with_chunks_tag "Onboarding", defer: true %>
    diff --git a/app/views/shared/authentication/_providers_registration_form.html.erb b/app/views/shared/authentication/_providers_registration_form.html.erb index 7e2ad9e7b..541eddd02 100644 --- a/app/views/shared/authentication/_providers_registration_form.html.erb +++ b/app/views/shared/authentication/_providers_registration_form.html.erb @@ -12,4 +12,4 @@ <% if authentication_enabled_providers.any? %>

    We require social registration to prevent abuse.

    -<% end %> \ No newline at end of file +<% end %> diff --git a/app/views/shared/authentication/_providers_signup_modal.html.erb b/app/views/shared/authentication/_providers_signup_modal.html.erb index b40f5691d..5265ce9a3 100644 --- a/app/views/shared/authentication/_providers_signup_modal.html.erb +++ b/app/views/shared/authentication/_providers_signup_modal.html.erb @@ -9,4 +9,4 @@ <% end %> More Sign In Options \ No newline at end of file + data-no-instant>More Sign In Options diff --git a/vendor/cache/erb_lint-0.0.34.gem b/vendor/cache/erb_lint-0.0.34.gem deleted file mode 100644 index e009bff8b..000000000 Binary files a/vendor/cache/erb_lint-0.0.34.gem and /dev/null differ diff --git a/vendor/cache/erb_lint-0.0.35.gem b/vendor/cache/erb_lint-0.0.35.gem new file mode 100644 index 000000000..0b84e1b94 Binary files /dev/null and b/vendor/cache/erb_lint-0.0.35.gem differ diff --git a/vendor/cache/rubocop-ast-0.2.0.gem b/vendor/cache/rubocop-ast-0.2.0.gem deleted file mode 100644 index c543a5a02..000000000 Binary files a/vendor/cache/rubocop-ast-0.2.0.gem and /dev/null differ diff --git a/vendor/cache/rubocop-ast-0.3.0.gem b/vendor/cache/rubocop-ast-0.3.0.gem new file mode 100644 index 000000000..391e5599e Binary files /dev/null and b/vendor/cache/rubocop-ast-0.3.0.gem differ