aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2015-04-01 17:09:58 -0300
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2015-04-01 17:09:58 -0300
commit4ba1376c608cc797c80402a73568744b1c855f67 (patch)
treedb92f2ff6631b6e29f9816bd8c00c890d77de06b
parentc91581ffee2fcf9b3d26f5ebc882127b83239800 (diff)
downloadrails-4ba1376c608cc797c80402a73568744b1c855f67.tar.gz
rails-4ba1376c608cc797c80402a73568744b1c855f67.tar.bz2
rails-4ba1376c608cc797c80402a73568744b1c855f67.zip
Remove old mri platform entries from our Gemfile
Since we now only support Ruby 2.2+, we can safely remove the old mri entries from the Gemfile. This also allows us not to lock to a specific bundler version, since :mri_22 was defined only on 1.7.11. Closes #19611.
-rw-r--r--Gemfile11
-rw-r--r--Gemfile.lock2
2 files changed, 2 insertions, 11 deletions
diff --git a/Gemfile b/Gemfile
index 70b8a74ddf..4d6b17202f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -63,18 +63,11 @@ group :test do
# FIX: Our test suite isn't ready to run in random order yet
gem 'minitest', '< 5.3.4'
- platforms :mri_19 do
- gem 'ruby-prof', '~> 0.11.2'
- end
-
- platforms :mri_21, :mri_22 do
+ platforms :mri do
gem 'stackprof'
+ # gem 'byebug'
end
- # platforms :mri do
- # gem 'byebug'
- # end
-
gem 'benchmark-ips'
end
diff --git a/Gemfile.lock b/Gemfile.lock
index 90ade529bc..d054d1e222 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -185,7 +185,6 @@ GEM
redis (~> 3.0)
resque (~> 1.25)
rufus-scheduler (~> 3.0)
- ruby-prof (0.11.3)
rufus-scheduler (3.0.9)
tzinfo
sdoc (0.4.1)
@@ -276,7 +275,6 @@ DEPENDENCIES
redcarpet (~> 3.2.2)
resque
resque-scheduler
- ruby-prof (~> 0.11.2)
sdoc (~> 0.4.0)
sequel
sidekiq