Use the release gems and point application gemfile to right loofah

2 files changed, 5 insertions, 5 deletions

diff --git a/Gemfile b/Gemfile
index 64db84b7e6..cadc9ceb81 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,9 +2,6 @@ source 'https://rubygems.org'
 
 gemspec
 
-#temporary gem until a new version of loofah is released
-gem 'loofah', github: 'kaspth/loofah', branch: 'single-scrub'
-
 # This needs to be with require false as it is
 # loaded after loading the test library to
 # ensure correct loading order
@@ -16,8 +13,9 @@ gem 'jquery-rails', '~> 3.1.0'
 gem 'turbolinks', github: 'rails/turbolinks', branch: 'master'
 gem 'coffee-rails', '~> 4.0.0'
 gem 'arel', github: 'rails/arel', branch: 'master'
-gem 'rails-dom-testing', github: 'rails/rails-dom-testing'
 gem 'rails-html-sanitizer', github: 'rails/rails-html-sanitizer'
+#temporary gem until a new version of loofah is released
+gem 'loofah', github: 'kaspth/loofah', branch: 'single-scrub'
 gem 'sprockets-rails', github: 'rails/sprockets-rails', branch: 'master'
 gem 'i18n', github: 'svenfuchs/i18n', branch: 'master'
 
diff --git a/railties/lib/rails/generators/rails/app/templates/Gemfile b/railties/lib/rails/generators/rails/app/templates/Gemfile
index ac16a117e8..05ea2bf8b2 100644
--- a/railties/lib/rails/generators/rails/app/templates/Gemfile
+++ b/railties/lib/rails/generators/rails/app/templates/Gemfile
@@ -16,7 +16,9 @@ source 'https://rubygems.org'
 # gem 'bcrypt', '~> 3.1.7'
 
 # Use Rails Html Sanitizer for HTML sanitization
-gem 'rails-html-snaitizer'
+gem 'rails-html-snaitizer', github: 'rails/rails', branch: 'master'
+#temporary gem until a new version of loofah is released
+gem 'loofah', github: 'kaspth/loofah', branch: 'single-scrub'
 
 # Use Unicorn as the app server
 # gem 'unicorn'