Merge branch 'release/2.0.6'

my-zivi · Jul 28, 2021 · 2ced427 · 2ced427
2 parents 5b6951a + 2caa24d
commit 2ced427
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/app/views/home/for_civil_servants.de.html.slim b/app/views/home/for_civil_servants.de.html.slim
@@ -1,6 +1,11 @@
 - content_for(:container_class, 'index-container')
 - content_for(:page_title, 'Wieso MyZivi?')
 - content_for(:displays_signup_button, true)
+- content_for(:social_tags) do
+  meta name='description' content='Mit MyZivi planst Du Deinen Einsatz in wenigen Schritten' /
+  meta property='og:title' content=t('layouts.application.meta.og_title') /
+  meta property='og:type' content='website' /
+
 = render 'home/navbar'
 
 section.solution

diff --git a/config/routes.rb b/config/routes.rb
@@ -27,7 +27,7 @@
   get '/for_organizations', to: 'home#for_organizations'
   get '/for_organizations/administration', to: 'home#administration', as: :administration
   get '/for_organizations/recruiting', to: 'home#recruiting', as: :recruiting
-  get '/wieso-myzivi', to: 'home#for_civil_servants'
+  get '/wieso-myzivi', to: 'home#for_civil_servants', as: :for_civil_servants
   get '/about_us', to: 'home#about_us'
   get '/agb', to: 'home#agb'
   get '/privacy_policy', to: 'home#privacy_policy'

diff --git a/config/sitemap.rb b/config/sitemap.rb
@@ -6,11 +6,13 @@
 SitemapGenerator::Sitemap.sitemaps_path = 'sitemaps/'
 SitemapGenerator::Sitemap.public_path = 'tmp/'
 SitemapGenerator::Sitemap.adapter = SitemapGenerator::MyZiviGoogleStorageAdapter.new
+SitemapGenerator::Sitemap.compress = false
 
 STATIC_PAGES = [
   new_user_session_path,
   new_user_registration_path,
   for_organizations_path,
+  for_civil_servants_path,
   administration_path,
   recruiting_path,
   about_us_path,

diff --git a/db/migrate/20210726075638_job_posting_html_content_to_action_text.rb b/db/migrate/20210726075638_job_posting_html_content_to_action_text.rb
@@ -1,5 +1,5 @@
 class JobPostingHtmlContentToActionText < ActiveRecord::Migration[6.1]
-include ActionView::Helpers::TextHelper
+  include ActionView::Helpers::TextHelper
 
   def up
     rename_column :job_postings, :description, :description_old