diff options
| author | Arthur Neves <arthurnn@gmail.com> | 2015-03-19 10:16:05 -0400 |
|---|---|---|
| committer | Arthur Neves <arthurnn@gmail.com> | 2015-03-19 10:16:05 -0400 |
| commit | 45786be516e13d55a1fca9a4abaddd5781209103 (patch) | |
| tree | c6b3ef4e56e9e11758a005da32fced68f4e5c2f4 /Gemfile | |
| parent | 9959e9525b9bd3324288c87f1c791cbb488c36c8 (diff) | |
| parent | a9eb12393fa1245620533a58ed36f651558ecae8 (diff) | |
| download | rails-45786be516e13d55a1fca9a4abaddd5781209103.tar.gz rails-45786be516e13d55a1fca9a4abaddd5781209103.tar.bz2 rails-45786be516e13d55a1fca9a4abaddd5781209103.zip | |
Merge branch 'bin_test_runner'. #19216
3 commits were missing when we merged the PR, probably they were lost
when that branch was rebased against latest master.
This merge, contains those 3 commits.
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -60,7 +60,6 @@ instance_eval File.read local_gemfile if File.exist? local_gemfile group :test do # FIX: Our test suite isn't ready to run in random order yet gem 'minitest', '< 5.3.4' - gem 'method_source' platforms :mri_19 do gem 'ruby-prof', '~> 0.11.2' |