Merge pull request #4754 from consul/remove_madrid_code

Remove legacy code from Madrid's fork

app/controllers/welcome_controller.rb

@@ -5,7 +5,7 @@ class WelcomeController < ApplicationController
   before_action :set_user_recommendations, only: :index, if: :current_user
   before_action :authenticate_user!, only: :welcome
 
-  layout "devise", only: [:welcome, :verification]
+  layout "devise", only: :welcome
 
   def index
     @header = Widget::Card.header.first
@@ -26,10 +26,6 @@ class WelcomeController < ApplicationController
     end
   end
 
-  def verification
-    redirect_to verification_path if signed_in?
-  end
-
   private
 
     def set_user_recommendations

app/views/welcome/verification.html.erb

@@ -1,14 +0,0 @@
-<h2><%= t("welcome.verification.title") %></h2>
-
-<div class="text-center margin-top">
-  <h3><%= t("welcome.verification.question", org_name: setting["org_name"]) %></h3>
-  <br>
-  <div class="row">
-    <div class="small-12 medium-6 column">
-      <%= link_to(t("welcome.verification.i_have_an_account"), verification_path, class: "button success radius expand") %>
-    </div>
-    <div class="small-12 medium-6 column">
-      <%= link_to(t("welcome.verification.i_dont_have_an_account"), new_user_registration_path(use_redeemable_code: true), class: "button radius expand") %>
-    </div>
-  </div>
-</div>

config/locales/en/general.yml

@@ -892,11 +892,6 @@ en:
       budget_investments:
         title: Recommended investments
       slide: "See %{title}"
-    verification:
-      i_dont_have_an_account: I don't have an account
-      i_have_an_account: I already have an account
-      question: Do you already have an account in %{org_name}?
-      title: Account verification
     welcome:
       go_to_index: Not now, go to index page
       start_using_consul: Go to index page

config/locales/es/general.yml

@@ -892,11 +892,6 @@ es:
       budget_investments:
         title: Presupuestos recomendados
       slide: "Ver %{title}"
-    verification:
-      i_dont_have_an_account: No tengo cuenta, quiero crear una y verificarla
-      i_have_an_account: Ya tengo una cuenta que quiero verificar
-      question: '¿Tienes ya una cuenta en %{org_name}?'
-      title: Verificación de cuenta
     welcome:
       go_to_index: Ahora no, ir a la página de inicio
       start_using_consul: Ir a la página de inicio