rails-ujs is now shipped with Action View
This commit is contained in:
parent
67389eb1a0
commit
ffb81ad6e3
1
Gemfile
1
Gemfile
|
@ -19,7 +19,6 @@ gem "jquery-rails"
|
|||
gem "coffee-rails"
|
||||
gem "sass-rails"
|
||||
gem "turbolinks", "~> 5"
|
||||
gem "rails-ujs", github: "rails/rails-ujs"
|
||||
|
||||
# require: false so bcrypt is loaded only when has_secure_password is used.
|
||||
# This is to avoid Active Model (and by extension the entire framework)
|
||||
|
|
|
@ -38,13 +38,6 @@ GIT
|
|||
event_emitter
|
||||
websocket
|
||||
|
||||
GIT
|
||||
remote: https://github.com/rails/rails-ujs.git
|
||||
revision: 767692f53dec79d42928029a55fdfcced35681e8
|
||||
specs:
|
||||
rails-ujs (0.0.1)
|
||||
railties (>= 3.1)
|
||||
|
||||
GIT
|
||||
remote: https://github.com/resque/resque.git
|
||||
revision: 20d885065ac19e7f7d7a982f4ed1296083db0300
|
||||
|
@ -419,7 +412,6 @@ DEPENDENCIES
|
|||
racc (>= 1.4.6)
|
||||
rack-cache (~> 1.2)
|
||||
rails!
|
||||
rails-ujs!
|
||||
rake (>= 11.1)
|
||||
rb-inotify!
|
||||
redcarpet (~> 3.2.3)
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
* Removed jquery-rails from default stack, instead rails-ujs is
|
||||
included as default UJS adapter.
|
||||
* Removed jquery-rails from default stack, instead rails-ujs that is shipped
|
||||
with Action View is included as default UJS adapter.
|
||||
|
||||
*Guillermo Iguaran*
|
||||
|
||||
|
|
|
@ -333,9 +333,6 @@ module Rails
|
|||
"Use #{options[:javascript]} as the JavaScript library")
|
||||
end
|
||||
|
||||
gems << GemfileEntry.github("rails-ujs", "rails/rails-ujs", nil,
|
||||
"Unobstrusive JavaScript adapter for Rails")
|
||||
|
||||
unless options[:skip_turbolinks]
|
||||
gems << GemfileEntry.version("turbolinks", "~> 5",
|
||||
"Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks")
|
||||
|
|
|
@ -35,7 +35,6 @@ class ApiAppGeneratorTest < Rails::Generators::TestCase
|
|||
|
||||
assert_file "Gemfile" do |content|
|
||||
assert_no_match(/gem 'coffee-rails'/, content)
|
||||
assert_no_match(/gem 'rails-ujs'/, content)
|
||||
assert_no_match(/gem 'sass-rails'/, content)
|
||||
assert_no_match(/gem 'web-console'/, content)
|
||||
assert_match(/# gem 'jbuilder'/, content)
|
||||
|
|
|
@ -452,7 +452,6 @@ class AppGeneratorTest < Rails::Generators::TestCase
|
|||
assert_file "app/assets/javascripts/application.js" do |contents|
|
||||
assert_match %r{^//= require rails-ujs}, contents
|
||||
end
|
||||
assert_gem "rails-ujs"
|
||||
end
|
||||
|
||||
def test_inclusion_of_javascript_libraries_if_required
|
||||
|
@ -477,7 +476,6 @@ class AppGeneratorTest < Rails::Generators::TestCase
|
|||
assert_file "Gemfile" do |content|
|
||||
assert_no_match(/coffee-rails/, content)
|
||||
assert_no_match(/uglifier/, content)
|
||||
assert_no_match(/rails-ujs/, content)
|
||||
end
|
||||
|
||||
assert_file "config/environments/production.rb" do |content|
|
||||
|
|
Loading…
Reference in New Issue