Skip to content

Commit d47eb7e

Browse files
corthmanncorthmann
committed
Merge remote-tracking branch 'upstream/master'
2 parents 435fa91 + 8ac47d2 commit d47eb7e

45 files changed

Lines changed: 2912 additions & 1540 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.travis.yml‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,16 @@ language: ruby
22
sudo: false
33
env:
44
- "RAILS_VERSION=4.1.0"
5-
- "RAILS_VERSION=4.2.0"
5+
- "RAILS_VERSION=4.2.6"
6+
- "RAILS_VERSION=5.0.0.beta3"
67
rvm:
78
- 2.0
89
- 2.1
9-
- 2.2
10+
- 2.2.4
11+
- 2.3.0
12+
matrix:
13+
exclude:
14+
- rvm: 2.0
15+
env: "RAILS_VERSION=5.0.0.beta3"
16+
- rvm: 2.1
17+
env: "RAILS_VERSION=5.0.0.beta3"

0 commit comments

Comments
 (0)