Restore 1.9.3 plus rails 4.0 and 4.1 support #4717

Merged
merged 8 commits into from Jan 11, 2017

Projects

None yet

4 participants

@deivid-rodriguez
Contributor

This fixes #4556 and restores a full Travis test matrix.

deivid-rodriguez added some commits Sep 9, 2016
@deivid-rodriguez deivid-rodriguez Test against latest versions of things 209331f
@deivid-rodriguez deivid-rodriguez Include all oficial rubies in Travis matrix e79de33
@deivid-rodriguez deivid-rodriguez Bring back Rails 4.0/4.1 + Ruby 1.9.3 support 39c6104
@deivid-rodriguez deivid-rodriguez Use latest Rubygems
Travis with such a big matrix like ours is very likely to expose bugs in
Rubygems and Bundler.  By using the latest versions, we make sure we
always get the latest bug fixes from upstream.
6cd714d
@deivid-rodriguez deivid-rodriguez Fix 1.9.3 dependency constraints
Otherwise installing deps for the 1.9.3 + Rails 4.0 combo fails with

```
json-2.0.2 requires ruby version ~> 2.0, which is incompatible with the
current version, ruby 1.9.3p551
```
3ffa3cd
@deivid-rodriguez deivid-rodriguez Restore Rails 4.0 and 4.1 entries in Travis
81bcae3
@deivid-rodriguez
Contributor

@varyonic @timoschilling Please review! 😉

@varyonic

Looks good, but still needs @timoschilling approval.

@timoschilling timoschilling Merge branch 'master' into restore_1_9_3_plus_rails_4_0_and_4_1_support
a16ad36
@codecov-io
codecov-io commented Jan 11, 2017 edited

Current coverage is 98.26% (diff: 100%)

Merging #4717 into master will increase coverage by 0.36%

@@             master      #4717   diff @@
==========================================
  Files           154        142    -12   
  Lines          4147       4033   -114   
  Methods           0          0          
  Messages          0          0          
  Branches          0          0          
==========================================
- Hits           4060       3963    -97   
+ Misses           87         70    -17   
  Partials          0          0          

Powered by Codecov. Last update bf6f3e0...a16ad36

@timoschilling timoschilling Merge branch 'master' into restore_1_9_3_plus_rails_4_0_and_4_1_support
ab9e1ed
@timoschilling timoschilling merged commit c99ac55 into activeadmin:master Jan 11, 2017

1 of 2 checks passed

continuous-integration/travis-ci/pr The Travis CI build is in progress
Details
hound No violations found. Woof!
@deivid-rodriguez deivid-rodriguez deleted the deivid-rodriguez:restore_1_9_3_plus_rails_4_0_and_4_1_support branch Jan 11, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment