move gemfiles/Gemfile.edge to root

This commit is contained in:
Francesco Rodriguez 2012-11-25 14:58:59 -05:00
parent 6be6599bb7
commit 7a0092ab32
2 changed files with 9 additions and 9 deletions

View File

@ -11,22 +11,22 @@ rvm:
- rbx-19mode - rbx-19mode
gemfile: gemfile:
- Gemfile - Gemfile
- gemfiles/Gemfile.edge-rails - Gemfile.edge
matrix: matrix:
exclude: exclude:
# Edge Rails is only compatible with 1.9.3 # Edge Rails is only compatible with 1.9.3
- gemfile: gemfiles/Gemfile.edge-rails - gemfile: Gemfile.edge
rvm: 1.8.7 rvm: 1.8.7
- gemfile: gemfiles/Gemfile.edge-rails - gemfile: Gemfile.edge
rvm: 1.9.2 rvm: 1.9.2
- gemfile: gemfiles/Gemfile.edge-rails - gemfile: Gemfile.edge
rvm: ree rvm: ree
- gemfile: gemfiles/Gemfile.edge-rails - gemfile: Gemfile.edge
rvm: jruby rvm: jruby
- gemfile: gemfiles/Gemfile.edge-rails - gemfile: Gemfile.edge
rvm: rbx-18mode rvm: rbx-18mode
allow_failures: allow_failures:
- gemfile: gemfiles/Gemfile.edge-rails - gemfile: Gemfile.edge
rvm: 1.9.3 rvm: 1.9.3
- gemfile: gemfiles/Gemfile.edge-rails - gemfile: Gemfile.edge
rvm: rbx-19mode rvm: rbx-19mode

View File

@ -1,6 +1,6 @@
source 'http://rubygems.org' source 'http://rubygems.org'
gemspec :path => '..' gemspec
gem 'rails', github: 'rails/rails' gem 'rails', github: 'rails/rails'