From 99bbba082fe35157e950161eb25d33c310b099a2 Mon Sep 17 00:00:00 2001 From: Antonio C Nalesso Moreira Date: Thu, 30 May 2013 22:29:43 +0100 Subject: [PATCH] fix failing on travis due to jquery-rails location --- test_app/Gemfile | 2 +- test_app/app/assets/javascripts/application.js | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/test_app/Gemfile b/test_app/Gemfile index 67f8bb2..9c0e90c 100644 --- a/test_app/Gemfile +++ b/test_app/Gemfile @@ -41,7 +41,7 @@ group :test do gem 'systemu' end -gem 'jquery-rails' +#gem 'jquery-rails' # To use ActiveModel has_secure_password # gem 'bcrypt-ruby', '~> 3.0.0' diff --git a/test_app/app/assets/javascripts/application.js b/test_app/app/assets/javascripts/application.js index 9097d83..078177c 100644 --- a/test_app/app/assets/javascripts/application.js +++ b/test_app/app/assets/javascripts/application.js @@ -10,6 +10,5 @@ // WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD // GO AFTER THE REQUIRES BELOW. // -//= require jquery //= require jquery_ujs //= require_tree .