From 964fcb5f0ebb2d5ee37fe54a7562790ceecd651d Mon Sep 17 00:00:00 2001 From: Seth Call Date: Sat, 15 Mar 2014 04:42:36 +0000 Subject: [PATCH] * VRFS-1456 - hoverIntent error goes away once you stop including jquery twice\! --- web/app/assets/javascripts/web/web.js | 1 - web/app/views/layouts/{web.erb => web.html.erb} | 0 web/app/views/users/signup_confirm.html.erb | 1 - 3 files changed, 2 deletions(-) rename web/app/views/layouts/{web.erb => web.html.erb} (100%) diff --git a/web/app/assets/javascripts/web/web.js b/web/app/assets/javascripts/web/web.js index 63f03e3d7..2bd4e50f3 100644 --- a/web/app/assets/javascripts/web/web.js +++ b/web/app/assets/javascripts/web/web.js @@ -18,7 +18,6 @@ //= require AAC_underscore //= require globals //= require AAB_message_factory -//= require AAC_underscore //= require facebook_helper //= require web/signupDialog //= require web/signinDialog diff --git a/web/app/views/layouts/web.erb b/web/app/views/layouts/web.html.erb similarity index 100% rename from web/app/views/layouts/web.erb rename to web/app/views/layouts/web.html.erb diff --git a/web/app/views/users/signup_confirm.html.erb b/web/app/views/users/signup_confirm.html.erb index 0070ca9dd..5dac7548f 100644 --- a/web/app/views/users/signup_confirm.html.erb +++ b/web/app/views/users/signup_confirm.html.erb @@ -1,5 +1,4 @@ <% provide(:title, 'Signup Confirmation') %> -<%= javascript_include_tag "landing/landing" %> <% if @user.nil? %>

Signup Already Confirmed