Merge branch 'main' into ik-1657-rollbar-bug-207

geeksforsocialchange · Jan 26, 2023 · 28ca056 · 28ca056
2 parents b911f1d + 499bd30
commit 28ca056
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 19 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -193,7 +193,7 @@ GEM
     friendly_id (5.3.0)
       activerecord (>= 4.0.0)
     geocoder (1.6.7)
-    globalid (1.0.0)
+    globalid (1.0.1)
       activesupport (>= 5.0)
     graphiql-rails (1.8.0)
       railties
@@ -278,7 +278,7 @@ GEM
     mini_magick (4.11.0)
     mini_mime (1.1.2)
     mini_portile2 (2.8.1)
-    minitest (5.16.3)
+    minitest (5.17.0)
     minitest-rails (6.1.0)
       minitest (~> 5.10)
       railties (~> 6.1.0)
@@ -336,7 +336,7 @@ GEM
     pundit (2.2.0)
       activesupport (>= 3.0.0)
     racc (1.6.2)
-    rack (2.2.4)
+    rack (2.2.6.2)
     rack-cors (1.1.1)
       rack (>= 2.0.0)
     rack-protection (2.2.0)

diff --git a/app/views/collections/show.html.erb b/app/views/collections/show.html.erb
@@ -16,26 +16,18 @@
   <div class="g g--collection">
       <div class="gi gi__3-5">
         <% if @collection.description %>
-          <div class="first-ele-lg"><% #= markdown @collection.description %></div>
+          <div class="first-ele-lg"><%# = markdown @collection.description %></div>
         <% end %>
 
         <%# FIXME: this needs to be killed after launch! %>
         <% if @collection.id == 1 %>
           <p>
-            <%= link_to 'Download winter leaflet (PDF, colour)',
-                        asset_path('2017/12/placecal_winter2017.pdf'),
-                        class: 'btn' %><br>
-            <%= link_to 'Download winter leaflet (PDF, B&W)',
-                        asset_path('2017/12/placecal_winter2017_bw.pdf'),
-                        class: 'btn' %>
+            <%= link_to 'Download winter leaflet (PDF, colour)', asset_path('2017/12/placecal_winter2017.pdf'), class: 'btn' %><br>
+            <%= link_to 'Download winter leaflet (PDF, B&W)', asset_path('2017/12/placecal_winter2017_bw.pdf'), class: 'btn' %>
           </p>
           <p>
-            <%= link_to 'Download winter A3 Poster (PDF, colour)',
-                         asset_path('2017/12/placecal_winter2017_poster.pdf'),
-                         class: 'btn' %><br>
-            <%= link_to 'Download winter A3 Poster (PDF, B&W)',
-                         asset_path('2017/12/placecal_winter2017_poster_bw.pdf'),
-                         class: 'btn' %>
+            <%= link_to 'Download winter A3 Poster (PDF, colour)', asset_path('2017/12/placecal_winter2017_poster.pdf'), class: 'btn' %><br>
+            <%= link_to 'Download winter A3 Poster (PDF, B&W)', asset_path('2017/12/placecal_winter2017_poster_bw.pdf'), class: 'btn' %>
           </p>
         <% end %>
       </div>
@@ -62,5 +54,5 @@
 </div>
 
 <% if @map&.any? %>
-  <%= render_component "map", points: @map, site: @current_site.slug %>
+  <%# = render_component "map", points: @map, site: @current_site.slug %>
 <% end %>
diff --git a/test/controllers/collections_controller_test.rb b/test/controllers/collections_controller_test.rb
@@ -9,7 +9,6 @@ class CollectionsControllerTest < ActionDispatch::IntegrationTest
   end
 
   test 'should show collection' do
-    skip 'New neighbourhood code stopped this working but Collections not used currently'
     get collection_url(@collection)
     assert_response :success
   end

diff --git a/test/integration/collections_integration_test.rb b/test/integration/collections_integration_test.rb
@@ -9,7 +9,7 @@ class CollectionsIntegrationTest < ActionDispatch::IntegrationTest
   end
 
   test 'should show collection' do
-    skip 'New neighbourhood code stopped this working but Collections not used currently'
+    # skip 'New neighbourhood code stopped this working but Collections not used currently'
     get collection_url(@collection)
     assert_response :success
     assert_select 'title', count: 1, text: "#{@collection.name} | #{@site.name}"