Skip to content

Commit

Permalink
Merge pull request #320 from activeadmin/release/1.5.0
Browse files Browse the repository at this point in the history
Get ready for 1.5.0 release
  • Loading branch information
deivid-rodriguez committed Feb 8, 2022
2 parents 86449a9 + 41c93ec commit 99142b5
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 4 deletions.
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,12 @@

## Master (unreleased)

## 1.5.0 [](https://github.com/activeadmin/arbre/compare/v1.4.0...v1.5.0)

* Avoid mutating string literals. [#292][] by [@tomgilligan][]
* Allow activesupport 7.0. [#314][] by [@tagliala][]
* Drop ruby 2.5 support. [#315][] by [@alejandroperea][]
* Fix keyword delegation in form component. [#318][] by [@deivid-rodriguez][]

## 1.4.0 [](https://github.com/activeadmin/arbre/compare/v1.3.0...v1.4.0)

Expand Down Expand Up @@ -100,11 +105,15 @@ Initial release and extraction from Active Admin
[#202]: https://github.com/activeadmin/arbre/pull/202
[#205]: https://github.com/activeadmin/arbre/pull/205
[#242]: https://github.com/activeadmin/arbre/pull/242
[#292]: https://github.com/activeadmin/arbre/pull/292
[#314]: https://github.com/activeadmin/arbre/pull/314
[#315]: https://github.com/activeadmin/arbre/pull/315
[#318]: https://github.com/activeadmin/arbre/pull/318

[@aramvisser]: https://github.com/aramvisser
[@LTe]: https://github.com/LTe
[@OscarBarrett]: https://github.com/OscarBarrett
[@alejandroperea]: https://github.com/alejandroperea
[@alexesDev]: https://github.com/alexesDev
[@deivid-rodriguez]: https://github.com/deivid-rodriguez
[@dlackty]: https://github.com/dlackty
Expand All @@ -117,3 +126,4 @@ Initial release and extraction from Active Admin
[@timoschilling]: https://github.com/timoschilling
[@varyonic]: https://github.com/varyonic
[@tagliala]: https://github.com/tagliala
[@tomgilligan]: https://github.com/tomgilligan
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
arbre (1.4.0)
arbre (1.5.0)
activesupport (>= 3.0.0, < 7.1)
ruby2_keywords (>= 0.0.2, < 1.0)

Expand Down
2 changes: 2 additions & 0 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
require 'bundler'
Bundler::GemHelper.install_tasks

import "tasks/gemfiles.rake"

require 'rspec/core/rake_task'
RSpec::Core::RakeTask.new(:spec)

Expand Down
4 changes: 2 additions & 2 deletions gemfiles/rails_61.gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: ..
specs:
arbre (1.4.0)
arbre (1.5.0)
activesupport (>= 3.0.0, < 7.1)
ruby2_keywords (>= 0.0.2, < 1.0)

Expand Down Expand Up @@ -233,4 +233,4 @@ DEPENDENCIES
rubocop-packaging

BUNDLED WITH
2.3.3
2.3.6
2 changes: 1 addition & 1 deletion lib/arbre/version.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# frozen_string_literal: true
module Arbre
VERSION = "1.4.0"
VERSION = "1.5.0"
end
9 changes: 9 additions & 0 deletions tasks/gemfiles.rake
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# frozen_string_literal: true
desc "Bundle all Gemfiles"
task :bundle do |_t, opts|
["Gemfile", *Dir.glob("gemfiles/*.gemfile")].each do |gemfile|
Bundler.with_original_env do
sh({ "BUNDLE_GEMFILE" => gemfile }, "bundle", *opts)
end
end
end

0 comments on commit 99142b5

Please sign in to comment.