Skip to content

Commit 1baffbe

Browse files
authored
Merge pull request #40 from doximity/batch/upgrade-rails
Upgrade rails to 6.1.7.3
2 parents 30e6529 + 38c3cb8 commit 1baffbe

File tree

3 files changed

+97
-82
lines changed

3 files changed

+97
-82
lines changed

Gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ group :development do
99
end
1010

1111
gem "pry", group: [:development, :test], require: false
12-
gem "rails", group: [:development, :test], require: false
12+
gem "rails", "~> 6.1.7.3", group: [:development, :test], require: false

Gemfile.lock

+95-80
Original file line numberDiff line numberDiff line change
@@ -10,60 +10,60 @@ PATH
1010
GEM
1111
remote: https://rubygems.org/
1212
specs:
13-
actioncable (6.1.4.4)
14-
actionpack (= 6.1.4.4)
15-
activesupport (= 6.1.4.4)
13+
actioncable (6.1.7.3)
14+
actionpack (= 6.1.7.3)
15+
activesupport (= 6.1.7.3)
1616
nio4r (~> 2.0)
1717
websocket-driver (>= 0.6.1)
18-
actionmailbox (6.1.4.4)
19-
actionpack (= 6.1.4.4)
20-
activejob (= 6.1.4.4)
21-
activerecord (= 6.1.4.4)
22-
activestorage (= 6.1.4.4)
23-
activesupport (= 6.1.4.4)
18+
actionmailbox (6.1.7.3)
19+
actionpack (= 6.1.7.3)
20+
activejob (= 6.1.7.3)
21+
activerecord (= 6.1.7.3)
22+
activestorage (= 6.1.7.3)
23+
activesupport (= 6.1.7.3)
2424
mail (>= 2.7.1)
25-
actionmailer (6.1.4.4)
26-
actionpack (= 6.1.4.4)
27-
actionview (= 6.1.4.4)
28-
activejob (= 6.1.4.4)
29-
activesupport (= 6.1.4.4)
25+
actionmailer (6.1.7.3)
26+
actionpack (= 6.1.7.3)
27+
actionview (= 6.1.7.3)
28+
activejob (= 6.1.7.3)
29+
activesupport (= 6.1.7.3)
3030
mail (~> 2.5, >= 2.5.4)
3131
rails-dom-testing (~> 2.0)
32-
actionpack (6.1.4.4)
33-
actionview (= 6.1.4.4)
34-
activesupport (= 6.1.4.4)
32+
actionpack (6.1.7.3)
33+
actionview (= 6.1.7.3)
34+
activesupport (= 6.1.7.3)
3535
rack (~> 2.0, >= 2.0.9)
3636
rack-test (>= 0.6.3)
3737
rails-dom-testing (~> 2.0)
3838
rails-html-sanitizer (~> 1.0, >= 1.2.0)
39-
actiontext (6.1.4.4)
40-
actionpack (= 6.1.4.4)
41-
activerecord (= 6.1.4.4)
42-
activestorage (= 6.1.4.4)
43-
activesupport (= 6.1.4.4)
39+
actiontext (6.1.7.3)
40+
actionpack (= 6.1.7.3)
41+
activerecord (= 6.1.7.3)
42+
activestorage (= 6.1.7.3)
43+
activesupport (= 6.1.7.3)
4444
nokogiri (>= 1.8.5)
45-
actionview (6.1.4.4)
46-
activesupport (= 6.1.4.4)
45+
actionview (6.1.7.3)
46+
activesupport (= 6.1.7.3)
4747
builder (~> 3.1)
4848
erubi (~> 1.4)
4949
rails-dom-testing (~> 2.0)
5050
rails-html-sanitizer (~> 1.1, >= 1.2.0)
51-
activejob (6.1.4.4)
52-
activesupport (= 6.1.4.4)
51+
activejob (6.1.7.3)
52+
activesupport (= 6.1.7.3)
5353
globalid (>= 0.3.6)
54-
activemodel (6.1.4.4)
55-
activesupport (= 6.1.4.4)
56-
activerecord (6.1.4.4)
57-
activemodel (= 6.1.4.4)
58-
activesupport (= 6.1.4.4)
59-
activestorage (6.1.4.4)
60-
actionpack (= 6.1.4.4)
61-
activejob (= 6.1.4.4)
62-
activerecord (= 6.1.4.4)
63-
activesupport (= 6.1.4.4)
64-
marcel (~> 1.0.0)
54+
activemodel (6.1.7.3)
55+
activesupport (= 6.1.7.3)
56+
activerecord (6.1.7.3)
57+
activemodel (= 6.1.7.3)
58+
activesupport (= 6.1.7.3)
59+
activestorage (6.1.7.3)
60+
actionpack (= 6.1.7.3)
61+
activejob (= 6.1.7.3)
62+
activerecord (= 6.1.7.3)
63+
activesupport (= 6.1.7.3)
64+
marcel (~> 1.0)
6565
mini_mime (>= 1.1.0)
66-
activesupport (6.1.4.4)
66+
activesupport (6.1.7.3)
6767
concurrent-ruby (~> 1.0, >= 1.0.2)
6868
i18n (>= 1.6, < 2)
6969
minitest (>= 5.1)
@@ -72,64 +72,78 @@ GEM
7272
ast (2.4.2)
7373
builder (3.2.4)
7474
coderay (1.1.3)
75-
concurrent-ruby (1.1.9)
75+
concurrent-ruby (1.2.2)
7676
crass (1.0.6)
77-
erubi (1.10.0)
78-
globalid (1.0.0)
77+
date (3.3.3)
78+
erubi (1.12.0)
79+
globalid (1.1.0)
7980
activesupport (>= 5.0)
80-
i18n (1.9.1)
81+
i18n (1.14.1)
8182
concurrent-ruby (~> 1.0)
82-
loofah (2.13.0)
83+
loofah (2.21.3)
8384
crass (~> 1.0.2)
84-
nokogiri (>= 1.5.9)
85-
mail (2.7.1)
85+
nokogiri (>= 1.12.0)
86+
mail (2.8.1)
8687
mini_mime (>= 0.1.1)
88+
net-imap
89+
net-pop
90+
net-smtp
8791
marcel (1.0.2)
8892
method_source (1.0.0)
8993
mini_mime (1.1.2)
90-
mini_portile2 (2.7.1)
91-
minitest (5.15.0)
92-
nio4r (2.5.8)
93-
nokogiri (1.13.1)
94-
mini_portile2 (~> 2.7.0)
94+
mini_portile2 (2.8.2)
95+
minitest (5.18.1)
96+
net-imap (0.3.6)
97+
date
98+
net-protocol
99+
net-pop (0.1.2)
100+
net-protocol
101+
net-protocol (0.2.1)
102+
timeout
103+
net-smtp (0.3.3)
104+
net-protocol
105+
nio4r (2.5.9)
106+
nokogiri (1.15.2)
107+
mini_portile2 (~> 2.8.2)
95108
racc (~> 1.4)
96-
nokogiri (1.13.1-x86_64-linux)
109+
nokogiri (1.15.2-x86_64-linux)
97110
racc (~> 1.4)
98111
parallel (1.21.0)
99112
parser (3.1.0.0)
100113
ast (~> 2.4.1)
101114
pry (0.14.1)
102115
coderay (~> 1.1)
103116
method_source (~> 1.0)
104-
racc (1.6.0)
105-
rack (2.2.3)
106-
rack-test (1.1.0)
107-
rack (>= 1.0, < 3)
108-
rails (6.1.4.4)
109-
actioncable (= 6.1.4.4)
110-
actionmailbox (= 6.1.4.4)
111-
actionmailer (= 6.1.4.4)
112-
actionpack (= 6.1.4.4)
113-
actiontext (= 6.1.4.4)
114-
actionview (= 6.1.4.4)
115-
activejob (= 6.1.4.4)
116-
activemodel (= 6.1.4.4)
117-
activerecord (= 6.1.4.4)
118-
activestorage (= 6.1.4.4)
119-
activesupport (= 6.1.4.4)
117+
racc (1.7.1)
118+
rack (2.2.7)
119+
rack-test (2.1.0)
120+
rack (>= 1.3)
121+
rails (6.1.7.3)
122+
actioncable (= 6.1.7.3)
123+
actionmailbox (= 6.1.7.3)
124+
actionmailer (= 6.1.7.3)
125+
actionpack (= 6.1.7.3)
126+
actiontext (= 6.1.7.3)
127+
actionview (= 6.1.7.3)
128+
activejob (= 6.1.7.3)
129+
activemodel (= 6.1.7.3)
130+
activerecord (= 6.1.7.3)
131+
activestorage (= 6.1.7.3)
132+
activesupport (= 6.1.7.3)
120133
bundler (>= 1.15.0)
121-
railties (= 6.1.4.4)
134+
railties (= 6.1.7.3)
122135
sprockets-rails (>= 2.0.0)
123136
rails-dom-testing (2.0.3)
124137
activesupport (>= 4.2.0)
125138
nokogiri (>= 1.6)
126-
rails-html-sanitizer (1.4.2)
127-
loofah (~> 2.3)
128-
railties (6.1.4.4)
129-
actionpack (= 6.1.4.4)
130-
activesupport (= 6.1.4.4)
139+
rails-html-sanitizer (1.6.0)
140+
loofah (~> 2.21)
141+
nokogiri (~> 1.14)
142+
railties (6.1.7.3)
143+
actionpack (= 6.1.7.3)
144+
activesupport (= 6.1.7.3)
131145
method_source
132-
rake (>= 0.13)
146+
rake (>= 12.2)
133147
thor (~> 1.0)
134148
rainbow (3.1.1)
135149
rake (13.0.6)
@@ -150,9 +164,9 @@ GEM
150164
rubocop (>= 1.7.0, < 2.0)
151165
rubocop-ast (>= 0.4.0)
152166
ruby-progressbar (1.11.0)
153-
sprockets (4.0.2)
167+
sprockets (4.2.0)
154168
concurrent-ruby (~> 1.0)
155-
rack (> 1, < 3)
169+
rack (>= 2.2.4, < 4)
156170
sprockets-rails (3.4.2)
157171
actionpack (>= 5.2)
158172
activesupport (>= 5.2)
@@ -163,22 +177,23 @@ GEM
163177
rubocop-performance (= 1.13.2)
164178
standardrb (1.0.1)
165179
standard
166-
thor (1.2.1)
167-
tzinfo (2.0.4)
180+
thor (1.2.2)
181+
timeout (0.3.2)
182+
tzinfo (2.0.6)
168183
concurrent-ruby (~> 1.0)
169184
unicode-display_width (2.1.0)
170185
websocket-driver (0.7.5)
171186
websocket-extensions (>= 0.1.0)
172187
websocket-extensions (0.1.5)
173-
zeitwerk (2.5.4)
188+
zeitwerk (2.6.8)
174189

175190
PLATFORMS
176191
ruby
177192
x86_64-linux
178193

179194
DEPENDENCIES
180195
pry
181-
rails
196+
rails (~> 6.1.7.3)
182197
rake-ui!
183198
sqlite3
184199
standardrb

test/integration/rake_tasks_request_test.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class RakeTasksRequestTest < ActionDispatch::IntegrationTest
3939
def mock_task.id
4040
"some_identifier"
4141
end
42-
mock_task.expect :call, OpenStruct.new(id: "1234_path"), [{args: "1,2,3", environment: "FOO=bar"}]
42+
mock_task.expect(:call, OpenStruct.new(id: "1234_path"), {args: "1,2,3", environment: "FOO=bar"})
4343

4444
mock_find_by_id = lambda do |args|
4545
assert args, "some_identifier"

0 commit comments

Comments
 (0)