Permalink
Browse files

Revert "Use jquery-rails from github"

This reverts commit 7a9a700.

Conflicts:
	railties/lib/rails/generators/app_base.rb
  • Loading branch information...
1 parent 3b6f611 commit 98b52826fe0de4d89df1bef7b72c9f8ca0db7bbc @spastorino spastorino committed Apr 2, 2013
Showing with 1 addition and 3 deletions.
  1. +1 −3 railties/lib/rails/generators/app_base.rb
@@ -225,14 +225,12 @@ def coffee_gemfile_entry
end
def javascript_gemfile_entry
- args = {'jquery' => ", github: 'rails/jquery-rails'"}
-
unless options[:skip_javascript]
<<-GEMFILE.gsub(/^ {12}/, '').strip_heredoc
#{coffee_gemfile_entry}
#{javascript_runtime_gemfile_entry}
- gem '#{options[:javascript]}-rails'#{args[options[:javascript]]}
+ gem '#{options[:javascript]}-rails'
# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
gem 'turbolinks'

0 comments on commit 98b5282

Please sign in to comment.