mirror of
https://github.com/ditkrg/active_model_serializers.git
synced 2026-01-24 14:56:50 +00:00
move gemfiles/Gemfile.edge to root
This commit is contained in:
parent
6be6599bb7
commit
7a0092ab32
16
.travis.yml
16
.travis.yml
@ -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
|
||||||
|
|||||||
@ -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'
|
||||||
|
|
||||||
Loading…
Reference in New Issue
Block a user