Merge pull request #700 from coopdevs/develop

Release v4.2.0

Gemfile

@@ -27,7 +27,7 @@ gem 'aws-sdk-s3', '~> 1.94', require: false
 gem 'image_processing', '~> 1.12'
 
 # Assets
-gem 'jquery-rails', '~> 4.3.5'
+gem 'jquery-rails', '~> 4.4.0'
 gem 'bootstrap-sass', '~> 3.4'
 gem 'sassc-rails', '~> 2.1.2'
 gem 'uglifier', '~> 4.2.0'

Gemfile.lock

@@ -171,7 +171,7 @@ GEM
     http-cookie (1.0.5)
       domain_name (~> 0.5)
     http_accept_language (2.1.1)
-    i18n (1.12.0)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
     image_processing (1.12.2)
       mini_magick (>= 4.9.5, < 5)
@@ -182,7 +182,7 @@ GEM
       railties (>= 5.2, < 6.2)
       responders (>= 2, < 4)
     jmespath (1.6.1)
-    jquery-rails (4.3.5)
+    jquery-rails (4.4.0)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
@@ -214,9 +214,9 @@ GEM
       i18n (>= 0.7, < 2)
       json (>= 1.7.7)
       rest-client (>= 1.8.0)
-    loofah (2.19.1)
+    loofah (2.21.3)
       crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
+      nokogiri (>= 1.12.0)
     mail (2.8.1)
       mini_mime (>= 0.1.1)
       net-imap
@@ -229,7 +229,7 @@ GEM
     mime-types-data (3.2022.0105)
     mini_magick (4.11.0)
     mini_mime (1.1.2)
-    mini_portile2 (2.8.1)
+    mini_portile2 (2.8.2)
     minitest (5.18.0)
     msgpack (1.5.2)
     net-imap (0.3.4)
@@ -267,8 +267,8 @@ GEM
     pundit (2.1.0)
       activesupport (>= 3.0.0)
     raabro (1.4.0)
-    racc (1.6.2)
-    rack (2.2.6.4)
+    racc (1.7.0)
+    rack (2.2.7)
     rack-test (2.1.0)
       rack (>= 1.3)
     rails (6.1.7.3)
@@ -406,7 +406,7 @@ GEM
     sshkit (1.21.2)
       net-scp (>= 1.1.2)
       net-ssh (>= 2.8.0)
-    thor (1.2.1)
+    thor (1.2.2)
     tilt (2.0.10)
     timeout (0.3.2)
     ttfunk (1.7.0)
@@ -437,7 +437,7 @@ GEM
     websocket-extensions (0.1.5)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.7)
+    zeitwerk (2.6.8)
 
 PLATFORMS
   ruby
@@ -461,7 +461,7 @@ DEPENDENCIES
   has_scope (~> 0.7.2)
   http_accept_language (~> 2.1.1)
   image_processing (~> 1.12)
-  jquery-rails (~> 4.3.5)
+  jquery-rails (~> 4.4.0)
   json_translate (~> 4.0.0)
   kaminari (~> 1.2.1)
   letter_opener (~> 1.7.0)

app/views/kaminari/_gap.html.erb

@@ -1,3 +1,3 @@
 <li class='disabled'>
-  <%= content_tag :a, raw(t 'views.pagination.truncate') %>
+  <%= content_tag :a, '...' %>
 </li>

app/views/shared/_posts.html.erb

@@ -7,7 +7,7 @@
       <% end %>
     </h4>
     <p>
-      <%= strip_tags(post.rendered_description.to_html) %>
+      <%= sanitize strip_tags(post.rendered_description.to_html) %>
     </p>
     <p>
       <small>

app/views/users/_member_card.html.erb

@@ -27,7 +27,7 @@
     </div>
     <div class="to-member-card__body">
       <div class="to-member-card__body__description">
-        <%= member.description&.truncate(124) %>
+        <%= sanitize strip_tags(markdown(member.description&.truncate(124))) %>
       </div>
       <div class="to-member-card__body__items">
         <% if member.phone.present? %>

app/views/users/show.html.erb

@@ -106,7 +106,7 @@
               <%= link_to post, post %>
             </div>
             <div class="col-sm-8">
-              <%= strip_tags(post.rendered_description.to_html) %>
+              <%= sanitize strip_tags(post.rendered_description.to_html) %>
             </div>
             <div class="col-sm-1">
               <% if @user != current_user %>
@@ -138,7 +138,7 @@
               <%= link_to post, post %>
             </div>
             <div class="col-sm-9">
-              <%= strip_tags(post.rendered_description.to_html) %>
+              <%= sanitize strip_tags(post.rendered_description.to_html) %>
             </div>
           </div>
         <% end %>

config/environments/test.rb

@@ -8,10 +8,10 @@
 
   config.cache_classes = true
 
-  # Do not eager load code on boot. This avoids loading your whole application
-  # just for the purpose of running a single test. If you are using a tool that
-  # preloads Rails for running tests, you may have to set it to true.
-  config.eager_load = false
+  # Eager loading loads your whole application. When running a single test locally,
+  # this probably isn't necessary. It's a good idea to do in a continuous integration
+  # system, or in some way before deploying your code.
+  config.eager_load = ENV["CI"].present?
 
   # Configure public file server for tests with Cache-Control for performance.
   config.public_file_server.enabled = true

config/locales/en.yml

@@ -373,7 +373,7 @@ en:
     recent_posts:
       subject: Newsletter
       text1: 'Latest offers published:'
-      text2: 'Lastest inquiries published:'
+      text2: 'Latest requests published:'
   organizations:
     give_time:
       give_time: Give time to
@@ -438,7 +438,7 @@ en:
   shared:
     movements:
       delete_reason: Are you sure to delete this comment?
-      movements: Movements
+      movements: Exchanges
     post_form:
       group_inquiry: Is it a group request?
       group_offer: Is it a group offer?