Fix gem dependencies

doorkeeper-gem · Jan 26, 2018 · 23ee3bd · 23ee3bd
1 parent d99845f
commit 23ee3bd
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem "rails", "~> 4.2.0"
+gem "rails", "~> 5.0"
 
 gem "appraisal"
 

diff --git a/doorkeeper.gemspec b/doorkeeper.gemspec
@@ -21,8 +21,8 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "capybara"
   s.add_development_dependency "coveralls"
-  s.add_development_dependency "database_cleaner", "~> 1.5.3"
-  s.add_development_dependency "factory_girl", "~> 4.7.0"
+  s.add_development_dependency "database_cleaner", "~> 1.6"
+  s.add_development_dependency "factory_girl", "~> 4.9"
   s.add_development_dependency "generator_spec", "~> 0.9.3"
   s.add_development_dependency "rake", ">= 11.3.0"
   s.add_development_dependency "rspec-rails"

diff --git a/gemfiles/rails_5_1.gemfile b/gemfiles/rails_5_1.gemfile
@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "rails", :github => "rails/rails"
+gem "rails", "~> 5.1"
 gem "appraisal"
 gem "activerecord-jdbcsqlite3-adapter", :platform => :jruby
 gem "sqlite3", :platform => [:ruby, :mswin, :mingw, :x64_mingw]

diff --git a/spec/dummy/config/initializers/secret_token.rb b/spec/dummy/config/initializers/secret_token.rb
@@ -5,5 +5,4 @@
 # Make sure the secret is at least 30 characters and all random,
 # no regular words or you'll be exposed to dictionary attacks.
 Dummy::Application.config.secret_key_base =
-  Dummy::Application.config.secret_token =
   'c00157b5a1bb6181792f0f4a8a080485de7bab9987e6cf159dc74c4f0573345c1bfa713b5d756e1491fc0b098567e8a619e2f8d268eda86a20a720d05d633780'