diff --git a/.github/workflows/docker-image-production.yml b/.github/workflows/docker-image-production.yml index 923f04f..d5d55fc 100644 --- a/.github/workflows/docker-image-production.yml +++ b/.github/workflows/docker-image-production.yml @@ -19,7 +19,7 @@ jobs: with: github-token: ${{ secrets.GITHUB_TOKEN }} image-name: production - image-tag: 1.4 + image-tag: 1.5 custom-args: --build-arg RAILS_ENV=production --build-arg FORCE_SSL=false --build-arg SECRET_KEY_BASE=${{ secrets.SECRET_KEY_BASE }} --build-arg MAILER_SENDER=${{ secrets.MAILER_SENDER }} dockerfile: docker/decidim.Dockerfile build-context: . diff --git a/app/overrides/controllers/decidim/devise/omniauth_registrations_controller_override.rb b/app/overrides/controllers/decidim/devise/omniauth_registrations_controller_override.rb new file mode 100644 index 0000000..4d8b2dd --- /dev/null +++ b/app/overrides/controllers/decidim/devise/omniauth_registrations_controller_override.rb @@ -0,0 +1,7 @@ +Decidim::Devise::OmniauthRegistrationsController.class_eval do + private + + def verified_email + @verified_email ||= oauth_data.dig(:info, :email) || params.dig(:user, :email) + end +end diff --git a/app/views/decidim/devise/omniauth_registrations/new.html.erb b/app/views/decidim/devise/omniauth_registrations/new.html.erb new file mode 100644 index 0000000..2f449af --- /dev/null +++ b/app/views/decidim/devise/omniauth_registrations/new.html.erb @@ -0,0 +1,46 @@ +
+ <%= t(".subtitle") %> +
+