Skip to content

Commit 2c6c8ca

Browse files
authored
Merge pull request #435 from activeadmin/1.7.2
Prepare for the 1.7.2 release
2 parents d2f0975 + fbb8e26 commit 2c6c8ca

File tree

2 files changed

+59
-58
lines changed

2 files changed

+59
-58
lines changed

Gemfile.lock

Lines changed: 58 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,65 @@
11
PATH
22
remote: .
33
specs:
4-
inherited_resources (1.7.1)
5-
actionpack (>= 3.2, < 5.1)
4+
inherited_resources (1.7.2)
5+
actionpack (>= 3.2, < 5.2.x)
66
has_scope (~> 0.6)
7-
railties (>= 3.2, < 5.1)
7+
railties (>= 3.2, < 5.2.x)
88
responders
99

1010
GEM
1111
remote: https://rubygems.org/
1212
specs:
13-
actioncable (5.0.1)
14-
actionpack (= 5.0.1)
15-
nio4r (~> 1.2)
13+
actioncable (5.1.0)
14+
actionpack (= 5.1.0)
15+
nio4r (~> 2.0)
1616
websocket-driver (~> 0.6.1)
17-
actionmailer (5.0.1)
18-
actionpack (= 5.0.1)
19-
actionview (= 5.0.1)
20-
activejob (= 5.0.1)
17+
actionmailer (5.1.0)
18+
actionpack (= 5.1.0)
19+
actionview (= 5.1.0)
20+
activejob (= 5.1.0)
2121
mail (~> 2.5, >= 2.5.4)
2222
rails-dom-testing (~> 2.0)
23-
actionpack (5.0.1)
24-
actionview (= 5.0.1)
25-
activesupport (= 5.0.1)
23+
actionpack (5.1.0)
24+
actionview (= 5.1.0)
25+
activesupport (= 5.1.0)
2626
rack (~> 2.0)
2727
rack-test (~> 0.6.3)
2828
rails-dom-testing (~> 2.0)
2929
rails-html-sanitizer (~> 1.0, >= 1.0.2)
30-
actionview (5.0.1)
31-
activesupport (= 5.0.1)
30+
actionview (5.1.0)
31+
activesupport (= 5.1.0)
3232
builder (~> 3.1)
33-
erubis (~> 2.7.0)
33+
erubi (~> 1.4)
3434
rails-dom-testing (~> 2.0)
35-
rails-html-sanitizer (~> 1.0, >= 1.0.2)
36-
activejob (5.0.1)
37-
activesupport (= 5.0.1)
35+
rails-html-sanitizer (~> 1.0, >= 1.0.3)
36+
activejob (5.1.0)
37+
activesupport (= 5.1.0)
3838
globalid (>= 0.3.6)
39-
activemodel (5.0.1)
40-
activesupport (= 5.0.1)
41-
activerecord (5.0.1)
42-
activemodel (= 5.0.1)
43-
activesupport (= 5.0.1)
44-
arel (~> 7.0)
45-
activesupport (5.0.1)
39+
activemodel (5.1.0)
40+
activesupport (= 5.1.0)
41+
activerecord (5.1.0)
42+
activemodel (= 5.1.0)
43+
activesupport (= 5.1.0)
44+
arel (~> 8.0)
45+
activesupport (5.1.0)
4646
concurrent-ruby (~> 1.0, >= 1.0.2)
4747
i18n (~> 0.7)
4848
minitest (~> 5.1)
4949
tzinfo (~> 1.1)
50-
arel (7.1.4)
50+
arel (8.0.0)
5151
builder (3.2.3)
52-
concurrent-ruby (1.0.4)
53-
erubis (2.7.0)
54-
globalid (0.3.7)
55-
activesupport (>= 4.1.0)
56-
has_scope (0.7.0)
57-
actionpack (>= 4.1, < 5.1)
58-
activesupport (>= 4.1, < 5.1)
59-
i18n (0.8.0)
52+
concurrent-ruby (1.0.5)
53+
erubi (1.6.0)
54+
globalid (0.4.0)
55+
activesupport (>= 4.2.0)
56+
has_scope (0.7.1)
57+
actionpack (>= 4.1, < 5.2)
58+
activesupport (>= 4.1, < 5.2)
59+
i18n (0.8.1)
6060
loofah (2.0.3)
6161
nokogiri (>= 1.5.9)
62-
mail (2.6.4)
62+
mail (2.6.5)
6363
mime-types (>= 1.16, < 4)
6464
metaclass (0.0.4)
6565
method_source (0.8.2)
@@ -72,23 +72,23 @@ GEM
7272
minitest (~> 5.0)
7373
mocha (1.2.1)
7474
metaclass (~> 0.0.1)
75-
nio4r (1.2.1)
76-
nokogiri (1.7.0.1)
75+
nio4r (2.0.0)
76+
nokogiri (1.7.1)
7777
mini_portile2 (~> 2.1.0)
7878
rack (2.0.1)
7979
rack-test (0.6.3)
8080
rack (>= 1.0)
81-
rails (5.0.1)
82-
actioncable (= 5.0.1)
83-
actionmailer (= 5.0.1)
84-
actionpack (= 5.0.1)
85-
actionview (= 5.0.1)
86-
activejob (= 5.0.1)
87-
activemodel (= 5.0.1)
88-
activerecord (= 5.0.1)
89-
activesupport (= 5.0.1)
81+
rails (5.1.0)
82+
actioncable (= 5.1.0)
83+
actionmailer (= 5.1.0)
84+
actionpack (= 5.1.0)
85+
actionview (= 5.1.0)
86+
activejob (= 5.1.0)
87+
activemodel (= 5.1.0)
88+
activerecord (= 5.1.0)
89+
activesupport (= 5.1.0)
9090
bundler (>= 1.3.0, < 2.0)
91-
railties (= 5.0.1)
91+
railties (= 5.1.0)
9292
sprockets-rails (>= 2.0.0)
9393
rails-controller-testing (1.0.1)
9494
actionpack (~> 5.x)
@@ -99,15 +99,16 @@ GEM
9999
nokogiri (~> 1.6)
100100
rails-html-sanitizer (1.0.3)
101101
loofah (~> 2.0)
102-
railties (5.0.1)
103-
actionpack (= 5.0.1)
104-
activesupport (= 5.0.1)
102+
railties (5.1.0)
103+
actionpack (= 5.1.0)
104+
activesupport (= 5.1.0)
105105
method_source
106106
rake (>= 0.8.7)
107107
thor (>= 0.18.1, < 2.0)
108108
rake (12.0.0)
109-
responders (2.3.0)
110-
railties (>= 4.2.0, < 5.1)
109+
responders (2.4.0)
110+
actionpack (>= 4.2.0, < 5.3)
111+
railties (>= 4.2.0, < 5.3)
111112
sprockets (3.7.1)
112113
concurrent-ruby (~> 1.0)
113114
rack (> 1, < 3)
@@ -116,10 +117,10 @@ GEM
116117
activesupport (>= 4.0)
117118
sprockets (>= 3.0.0)
118119
thor (0.19.4)
119-
thread_safe (0.3.5)
120-
tzinfo (1.2.2)
120+
thread_safe (0.3.6)
121+
tzinfo (1.2.3)
121122
thread_safe (~> 0.1)
122-
websocket-driver (0.6.4)
123+
websocket-driver (0.6.5)
123124
websocket-extensions (>= 0.1.0)
124125
websocket-extensions (0.1.2)
125126

@@ -130,7 +131,7 @@ DEPENDENCIES
130131
inherited_resources!
131132
minitest-rg
132133
mocha
133-
rails (~> 5.0)
134+
rails (~> 5.1)
134135
rails-controller-testing
135136

136137
BUNDLED WITH

lib/inherited_resources/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
module InheritedResources
2-
VERSION = '1.7.1'.freeze
2+
VERSION = '1.7.2'.freeze
33
end

0 commit comments

Comments
 (0)