diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2013-04-02 00:02:09 -0300 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2013-04-02 00:02:09 -0300 |
| commit | 98b52826fe0de4d89df1bef7b72c9f8ca0db7bbc (patch) | |
| tree | 4be0bfbe7684a5c2ef68016b65531b746f2b482d /railties | |
| parent | 3b6f61175ff2b2798151dd3acf332e9ceadd7e0b (diff) | |
| download | rails-98b52826fe0de4d89df1bef7b72c9f8ca0db7bbc.tar.gz rails-98b52826fe0de4d89df1bef7b72c9f8ca0db7bbc.tar.bz2 rails-98b52826fe0de4d89df1bef7b72c9f8ca0db7bbc.zip | |
Revert "Use jquery-rails from github"
This reverts commit 7a9a7007637b8279501770be03bd84ce83d61ab8.
Conflicts:
railties/lib/rails/generators/app_base.rb
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails/generators/app_base.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb index 841348f391..de14186a09 100644 --- a/railties/lib/rails/generators/app_base.rb +++ b/railties/lib/rails/generators/app_base.rb @@ -225,14 +225,12 @@ module Rails 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' |