Merge pull request #87 from nbit001/fix_require_jquery_rails

fix failing on travis due to jquery-rails file location.
This commit is contained in:
Nalesso Moreira 2013-05-30 14:39:12 -07:00
commit 2abc3a6dfc
2 changed files with 1 additions and 2 deletions

View File

@ -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'

View File

@ -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 .