rails-ujs is now shipped with Action View

6 files changed, 2 insertions, 17 deletions

diff --git a/Gemfile b/Gemfile
index 99dd23006b..e30858a124 100644
--- a/Gemfile
+++ b/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)
diff --git a/Gemfile.lock b/Gemfile.lock
index d2e968c817..eb14330c2b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -39,13 +39,6 @@ GIT
       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
   specs:
@@ -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)
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index 5e5583734a..4126c70163 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -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*
 
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
index 2951d6c83d..2778c93429 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -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")
diff --git a/railties/test/generators/api_app_generator_test.rb b/railties/test/generators/api_app_generator_test.rb
index cefad48f52..7069a07bbe 100644
--- a/railties/test/generators/api_app_generator_test.rb
+++ b/railties/test/generators/api_app_generator_test.rb
@@ -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)
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index 2d01da7f46..d2818eeaf1 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -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|