fix Gemfile.lock, fix conference show deface

Green-Party-of-Canada-Members · Nov 29, 2023 · dc1eb57 · dc1eb57
1 parent f222406
commit dc1eb57
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -9,6 +9,7 @@ on:
 
 env:
   RUBY_VERSION: 3.0.6
+  NODE_VERSION: 16.9.1
 
 jobs:
   lint-report:
@@ -25,3 +26,6 @@ jobs:
 
       - run: bundle exec rubocop -P
         name: Lint Ruby files
+
+      - run: bundle exec erblint app/**/*.erb
+        name: Lint ERB files
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -54,11 +54,7 @@ jobs:
           node-version: ${{ env.NODE_VERSION }}
 
       - name: Precompile assets
-        run: |
-          npm ci
-          bundle exec rake assets:precompile
-        env:
-          RAILS_ENV: test
+        run: RAILS_ENV=test bundle exec rails assets:precompile
 
       - name: Run RSpec
         run: SIMPLECOV=1 CODECOV=1 bundle exec rspec

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -884,8 +884,8 @@ GEM
     zeitwerk (2.6.12)
 
 PLATFORMS
-  x86_64-linux
   x86_64-darwin-23
+  x86_64-linux
 
 DEPENDENCIES
   aws-sdk-s3

diff --git a/app/overrides/decidim/conferences/conferences/show/show_donate.html.erb.deface b/app/overrides/decidim/conferences/conferences/show/show_donate.html.erb.deface
@@ -4,7 +4,7 @@
   <div class="row">
     <div class="column medium-9">
       <h3 class="section-heading"><%= t("conferences.show.introduction", scope: "decidim") %></h3>
-      <%= decidim_sanitize_editor_admin translated_attribute(current_participatory_space.short_description) %>
+      <%= decidim_sanitize_editor translated_attribute(current_participatory_space.short_description) %>
     </div>
     <div class="column medium-3">
       <%= render "decidim/donate" %>
@@ -13,5 +13,6 @@
   </div>
 <% else %>
   <h3 class="section-heading"><%= t("conferences.show.introduction", scope: "decidim") %></h3>
-  <%= decidim_sanitize_editor_admin translated_attribute(current_participatory_space.short_description) %>
+  <%= decidim_sanitize_editor translated_attribute(current_participatory_space.short_description) %>
 <% end %>
+app/overrides/decidim/conferences/conferences/show/show_donate.html.erb.deface