Merge remote-tracking branch 'upstream/pull/1603'

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index 4ce4a75f5e8de696cbf30ce71097d71fb57b7a94..48658f65d371f1097f440d0dee50e35baa8dc6d3 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
 # Require rails
-gem "rails", "5.0.4"
+gem "rails", "5.0.5"
 
 # Require things which have moved to gems in ruby 1.9
 gem "bigdecimal", "~> 1.1.0", :platforms => :ruby_19
@@ -113,7 +113,6 @@ group :test do
   gem "minitest", "~> 5.1", :platforms => [:ruby_19, :ruby_20]
   gem "rails-controller-testing"
   gem "rubocop"
-  gem "timecop"
   gem "webmock"
 end