chiu
/
impressionist
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
parent f812ae5abf 99bbba082f
commit 2abc3a6dfc
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test_app/Gemfile
View File

@ -41,7 +41,7 @@ group :test do
gem 'systemu' gem 'systemu'
end end
gem 'jquery-rails' #gem 'jquery-rails'
# To use ActiveModel has_secure_password # To use ActiveModel has_secure_password
# gem 'bcrypt-ruby', '~> 3.0.0' # gem 'bcrypt-ruby', '~> 3.0.0'

1
test_app/app/assets/javascripts/application.js
View File

@ -10,6 +10,5 @@
// WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD // WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
// GO AFTER THE REQUIRES BELOW. // GO AFTER THE REQUIRES BELOW.
// //
//= require jquery
//= require jquery_ujs //= require jquery_ujs
//= require_tree . //= require_tree .