Skip to content

Commit baf5e00

Browse files
carlosantoniodasilvacarlosantoniodasilva
authored
Merge pull request heartcombo#5435 from dixpac/dix/rails_7
Add support for Rails 7
2 parents 9f5b837 + 289dd5f commit baf5e00

3 files changed

Lines changed: 58 additions & 58 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
### unreleased
22

33
* enhancements
4-
* Add support for Rails 7.0 rc.
4+
* Add support for Rails 7.0
55

66
### 4.8.0 - 2021-04-29
77

‎Gemfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ source "https://rubygems.org"
44

55
gemspec
66

7-
gem "rails", "~> 7.0.0.rc1"
7+
gem "rails", "~> 7.0.0"
88
gem "omniauth"
99
gem "omniauth-oauth2"
1010
gem "rdoc"

‎Gemfile.lock‎

Lines changed: 56 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -20,61 +20,61 @@ PATH
2020
GEM
2121
remote: https://rubygems.org/
2222
specs:
23-
actioncable (7.0.0.rc1)
24-
actionpack (= 7.0.0.rc1)
25-
activesupport (= 7.0.0.rc1)
23+
actioncable (7.0.0)
24+
actionpack (= 7.0.0)
25+
activesupport (= 7.0.0)
2626
nio4r (~> 2.0)
2727
websocket-driver (>= 0.6.1)
28-
actionmailbox (7.0.0.rc1)
29-
actionpack (= 7.0.0.rc1)
30-
activejob (= 7.0.0.rc1)
31-
activerecord (= 7.0.0.rc1)
32-
activestorage (= 7.0.0.rc1)
33-
activesupport (= 7.0.0.rc1)
28+
actionmailbox (7.0.0)
29+
actionpack (= 7.0.0)
30+
activejob (= 7.0.0)
31+
activerecord (= 7.0.0)
32+
activestorage (= 7.0.0)
33+
activesupport (= 7.0.0)
3434
mail (>= 2.7.1)
35-
actionmailer (7.0.0.rc1)
36-
actionpack (= 7.0.0.rc1)
37-
actionview (= 7.0.0.rc1)
38-
activejob (= 7.0.0.rc1)
39-
activesupport (= 7.0.0.rc1)
35+
actionmailer (7.0.0)
36+
actionpack (= 7.0.0)
37+
actionview (= 7.0.0)
38+
activejob (= 7.0.0)
39+
activesupport (= 7.0.0)
4040
mail (~> 2.5, >= 2.5.4)
4141
rails-dom-testing (~> 2.0)
42-
actionpack (7.0.0.rc1)
43-
actionview (= 7.0.0.rc1)
44-
activesupport (= 7.0.0.rc1)
42+
actionpack (7.0.0)
43+
actionview (= 7.0.0)
44+
activesupport (= 7.0.0)
4545
rack (~> 2.0, >= 2.2.0)
4646
rack-test (>= 0.6.3)
4747
rails-dom-testing (~> 2.0)
4848
rails-html-sanitizer (~> 1.0, >= 1.2.0)
49-
actiontext (7.0.0.rc1)
50-
actionpack (= 7.0.0.rc1)
51-
activerecord (= 7.0.0.rc1)
52-
activestorage (= 7.0.0.rc1)
53-
activesupport (= 7.0.0.rc1)
49+
actiontext (7.0.0)
50+
actionpack (= 7.0.0)
51+
activerecord (= 7.0.0)
52+
activestorage (= 7.0.0)
53+
activesupport (= 7.0.0)
5454
globalid (>= 0.6.0)
5555
nokogiri (>= 1.8.5)
56-
actionview (7.0.0.rc1)
57-
activesupport (= 7.0.0.rc1)
56+
actionview (7.0.0)
57+
activesupport (= 7.0.0)
5858
builder (~> 3.1)
5959
erubi (~> 1.4)
6060
rails-dom-testing (~> 2.0)
6161
rails-html-sanitizer (~> 1.1, >= 1.2.0)
62-
activejob (7.0.0.rc1)
63-
activesupport (= 7.0.0.rc1)
62+
activejob (7.0.0)
63+
activesupport (= 7.0.0)
6464
globalid (>= 0.3.6)
65-
activemodel (7.0.0.rc1)
66-
activesupport (= 7.0.0.rc1)
67-
activerecord (7.0.0.rc1)
68-
activemodel (= 7.0.0.rc1)
69-
activesupport (= 7.0.0.rc1)
70-
activestorage (7.0.0.rc1)
71-
actionpack (= 7.0.0.rc1)
72-
activejob (= 7.0.0.rc1)
73-
activerecord (= 7.0.0.rc1)
74-
activesupport (= 7.0.0.rc1)
65+
activemodel (7.0.0)
66+
activesupport (= 7.0.0)
67+
activerecord (7.0.0)
68+
activemodel (= 7.0.0)
69+
activesupport (= 7.0.0)
70+
activestorage (7.0.0)
71+
actionpack (= 7.0.0)
72+
activejob (= 7.0.0)
73+
activerecord (= 7.0.0)
74+
activesupport (= 7.0.0)
7575
marcel (~> 1.0)
7676
mini_mime (>= 1.1.0)
77-
activesupport (7.0.0.rc1)
77+
activesupport (7.0.0)
7878
concurrent-ruby (~> 1.0, >= 1.0.2)
7979
i18n (>= 1.6, < 2)
8080
minitest (>= 5.1)
@@ -109,7 +109,7 @@ GEM
109109
i18n (1.8.11)
110110
concurrent-ruby (~> 1.0)
111111
jwt (2.3.0)
112-
loofah (2.12.0)
112+
loofah (2.13.0)
113113
crass (~> 1.0.2)
114114
nokogiri (>= 1.5.9)
115115
mail (2.7.1)
@@ -118,7 +118,7 @@ GEM
118118
method_source (1.0.0)
119119
mini_mime (1.1.2)
120120
mini_portile2 (2.6.1)
121-
minitest (5.14.4)
121+
minitest (5.15.0)
122122
mocha (1.13.0)
123123
multi_json (1.15.0)
124124
multi_xml (0.6.0)
@@ -155,28 +155,28 @@ GEM
155155
rack
156156
rack-test (1.1.0)
157157
rack (>= 1.0, < 3)
158-
rails (7.0.0.rc1)
159-
actioncable (= 7.0.0.rc1)
160-
actionmailbox (= 7.0.0.rc1)
161-
actionmailer (= 7.0.0.rc1)
162-
actionpack (= 7.0.0.rc1)
163-
actiontext (= 7.0.0.rc1)
164-
actionview (= 7.0.0.rc1)
165-
activejob (= 7.0.0.rc1)
166-
activemodel (= 7.0.0.rc1)
167-
activerecord (= 7.0.0.rc1)
168-
activestorage (= 7.0.0.rc1)
169-
activesupport (= 7.0.0.rc1)
158+
rails (7.0.0)
159+
actioncable (= 7.0.0)
160+
actionmailbox (= 7.0.0)
161+
actionmailer (= 7.0.0)
162+
actionpack (= 7.0.0)
163+
actiontext (= 7.0.0)
164+
actionview (= 7.0.0)
165+
activejob (= 7.0.0)
166+
activemodel (= 7.0.0)
167+
activerecord (= 7.0.0)
168+
activestorage (= 7.0.0)
169+
activesupport (= 7.0.0)
170170
bundler (>= 1.15.0)
171-
railties (= 7.0.0.rc1)
171+
railties (= 7.0.0)
172172
rails-dom-testing (2.0.3)
173173
activesupport (>= 4.2.0)
174174
nokogiri (>= 1.6)
175175
rails-html-sanitizer (1.4.2)
176176
loofah (~> 2.3)
177-
railties (7.0.0.rc1)
178-
actionpack (= 7.0.0.rc1)
179-
activesupport (= 7.0.0.rc1)
177+
railties (7.0.0)
178+
actionpack (= 7.0.0)
179+
activesupport (= 7.0.0)
180180
method_source
181181
rake (>= 12.2)
182182
thor (~> 1.0)
@@ -215,7 +215,7 @@ DEPENDENCIES
215215
omniauth-facebook
216216
omniauth-oauth2
217217
omniauth-openid
218-
rails (~> 7.0.0.rc1)
218+
rails (~> 7.0.0)
219219
rails-controller-testing!
220220
rdoc
221221
responders (~> 3.0)

0 commit comments

Comments
 (0)