Skip to content
This repository has been archived by the owner on Aug 29, 2024. It is now read-only.

Commit

Permalink
Merge pull request #2 from playpasshq/master
Browse files Browse the repository at this point in the history
Rebase with master
  • Loading branch information
JanStevens authored Dec 27, 2019
2 parents df8c4eb + b74e7ec commit 416c808
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 29 deletions.
14 changes: 2 additions & 12 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,19 @@ rvm:
- 2.4
- 2.5
- 2.6
- 2.7
- ruby-head
- jruby
- jruby-head
gemfile:
- gemfiles/rails_4_2.gemfile
- gemfiles/rails_5_0.gemfile
- gemfiles/rails_5_1.gemfile
- gemfiles/rails_5_2.gemfile
- gemfiles/rails_6_0.gemfile
before_install:
# Cannot use bundler 2.x due to dependency (mainly rails 4.2)
# Solution from https://github.com/rails/rails/blob/4-2-stable/.travis.yml
- "travis_retry gem update --system 2.7.8 --no-doc || travis_retry gem update --system 2.7.8 --no-rdoc --no-ri"
- "travis_retry gem update --system --no-doc || travis_retry gem update --system --no-rdoc --no-ri"
- "travis_retry gem install bundler -v '<2'"
env:
global:
Expand All @@ -32,16 +32,6 @@ env:
matrix:
fast_finish: true
allow_failures:
# bundler version conflict
- rvm: 2.3
gemfile: gemfiles/rails_4_2.gemfile
- rvm: 2.4
gemfile: gemfiles/rails_4_2.gemfile
- rvm: 2.5
gemfile: gemfiles/rails_4_2.gemfile
- rvm: jruby
gemfile: gemfiles/rails_4_2.gemfile
- gemfile: gemfiles/rails_6_0.gemfile
- rvm: ruby-head
- rvm: jruby-head
exclude:
Expand Down
6 changes: 1 addition & 5 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@

appraise "rails_4_2" do
gem "rails", "~> 4.2.0"
end

appraise "rails_5_0" do
gem "rails", "~> 5.0.0"
end
Expand All @@ -16,5 +12,5 @@ appraise "rails_5_2" do
end

appraise "rails_6_0" do
gem "rails", "~> 6.0.0.beta1"
gem "rails", "~> 6.0.0"
end
11 changes: 10 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,14 @@ This project adheres to [Semantic Versioning](http://semver.org/).
- Nothing


## [2.8.2] - 2019-12-27

### Changed

- Use `delete_multiple_objects` when storage is `aws`
(https://github.com/AssetSync/asset_sync/pull/392)


## [2.8.1] - 2019-07-25

### Changed
Expand Down Expand Up @@ -922,7 +930,8 @@ Changes:
* Merge branch 'sinatra'


[Unreleased]: https://github.com/AssetSync/asset_sync/compare/v2.8.1...HEAD
[Unreleased]: https://github.com/AssetSync/asset_sync/compare/v2.8.2...HEAD
[2.8.2]: https://github.com/AssetSync/asset_sync/compare/v2.8.1...v2.8.2
[2.8.1]: https://github.com/AssetSync/asset_sync/compare/v2.8.0...v2.8.1
[2.8.0]: https://github.com/AssetSync/asset_sync/compare/v2.7.0...v2.8.0
[2.7.0]: https://github.com/AssetSync/asset_sync/compare/v2.6.0...v2.7.0
Expand Down
10 changes: 0 additions & 10 deletions gemfiles/rails_4_2.gemfile

This file was deleted.

2 changes: 1 addition & 1 deletion lib/asset_sync/version.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# frozen_string_literal: true

module AssetSync
VERSION = "2.8.1".freeze
VERSION = "2.8.2"
end

0 comments on commit 416c808

Please sign in to comment.