Skip to content

Commit 99142b5

Browse files
Merge pull request #320 from activeadmin/release/1.5.0
Get ready for 1.5.0 release
2 parents 86449a9 + 41c93ec commit 99142b5

File tree

6 files changed

+25
-4
lines changed

6 files changed

+25
-4
lines changed

CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,12 @@
22

33
## Master (unreleased)
44

5+
## 1.5.0 [](https://github.com/activeadmin/arbre/compare/v1.4.0...v1.5.0)
6+
7+
* Avoid mutating string literals. [#292][] by [@tomgilligan][]
58
* Allow activesupport 7.0. [#314][] by [@tagliala][]
9+
* Drop ruby 2.5 support. [#315][] by [@alejandroperea][]
10+
* Fix keyword delegation in form component. [#318][] by [@deivid-rodriguez][]
611

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

@@ -100,11 +105,15 @@ Initial release and extraction from Active Admin
100105
[#202]: https://github.com/activeadmin/arbre/pull/202
101106
[#205]: https://github.com/activeadmin/arbre/pull/205
102107
[#242]: https://github.com/activeadmin/arbre/pull/242
108+
[#292]: https://github.com/activeadmin/arbre/pull/292
103109
[#314]: https://github.com/activeadmin/arbre/pull/314
110+
[#315]: https://github.com/activeadmin/arbre/pull/315
111+
[#318]: https://github.com/activeadmin/arbre/pull/318
104112

105113
[@aramvisser]: https://github.com/aramvisser
106114
[@LTe]: https://github.com/LTe
107115
[@OscarBarrett]: https://github.com/OscarBarrett
116+
[@alejandroperea]: https://github.com/alejandroperea
108117
[@alexesDev]: https://github.com/alexesDev
109118
[@deivid-rodriguez]: https://github.com/deivid-rodriguez
110119
[@dlackty]: https://github.com/dlackty
@@ -117,3 +126,4 @@ Initial release and extraction from Active Admin
117126
[@timoschilling]: https://github.com/timoschilling
118127
[@varyonic]: https://github.com/varyonic
119128
[@tagliala]: https://github.com/tagliala
129+
[@tomgilligan]: https://github.com/tomgilligan

Gemfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PATH
22
remote: .
33
specs:
4-
arbre (1.4.0)
4+
arbre (1.5.0)
55
activesupport (>= 3.0.0, < 7.1)
66
ruby2_keywords (>= 0.0.2, < 1.0)
77

Rakefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
require 'bundler'
33
Bundler::GemHelper.install_tasks
44

5+
import "tasks/gemfiles.rake"
6+
57
require 'rspec/core/rake_task'
68
RSpec::Core::RakeTask.new(:spec)
79

gemfiles/rails_61.gemfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PATH
22
remote: ..
33
specs:
4-
arbre (1.4.0)
4+
arbre (1.5.0)
55
activesupport (>= 3.0.0, < 7.1)
66
ruby2_keywords (>= 0.0.2, < 1.0)
77

@@ -233,4 +233,4 @@ DEPENDENCIES
233233
rubocop-packaging
234234

235235
BUNDLED WITH
236-
2.3.3
236+
2.3.6

lib/arbre/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# frozen_string_literal: true
22
module Arbre
3-
VERSION = "1.4.0"
3+
VERSION = "1.5.0"
44
end

tasks/gemfiles.rake

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# frozen_string_literal: true
2+
desc "Bundle all Gemfiles"
3+
task :bundle do |_t, opts|
4+
["Gemfile", *Dir.glob("gemfiles/*.gemfile")].each do |gemfile|
5+
Bundler.with_original_env do
6+
sh({ "BUNDLE_GEMFILE" => gemfile }, "bundle", *opts)
7+
end
8+
end
9+
end

0 commit comments

Comments
 (0)