Skip to content

Commit da71edb

Browse files
committed
bump rails to 5.2.4.6
1 parent 16af6e4 commit da71edb

File tree

3 files changed

+43
-43
lines changed

3 files changed

+43
-43
lines changed

CHANGELOG.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ You will need to install the latest version of BETY (or the version you want to
1717

1818
In this case you can simply pull down the version you want, and run `docker-compose bety migrate`.
1919

20-
## [5.3.1] - 2021-10-07
20+
## [5.4.0] - 2021-10-07
2121

2222
### Added
2323
- configuration to sync forks of BETY using https://github.com/wei/pull
@@ -32,7 +32,7 @@ In this case you can simply pull down the version you want, and run `docker-comp
3232
### Changed
3333

3434
- [#705](https://github.com/PecanProject/bety/pull/705) : More clearly indicate method is optional in bulk upload
35-
- updated rails to 5.2.4.5
35+
- updated rails to 5.2.4.6
3636
- removed static route, it was only used to render 404.
3737
- allow n=1 in bulk upload https://github.com/PecanProject/bety/pull/704
3838

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
source "http://rubygems.org"
22

3-
gem "rails", "5.2.4.5"
3+
gem "rails", "5.2.4.6"
44
# needed for rails 3.1 and above until we phase out prototype:
55
## gem 'prototype-rails', github: 'rails/prototype-rails', branch: '4.2' # see https://github.com/rails/prototype-rails/issues/37
66
gem "nokogiri"

Gemfile.lock

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,41 @@
11
GEM
22
remote: http://rubygems.org/
33
specs:
4-
actioncable (5.2.4.5)
5-
actionpack (= 5.2.4.5)
4+
actioncable (5.2.4.6)
5+
actionpack (= 5.2.4.6)
66
nio4r (~> 2.0)
77
websocket-driver (>= 0.6.1)
8-
actionmailer (5.2.4.5)
9-
actionpack (= 5.2.4.5)
10-
actionview (= 5.2.4.5)
11-
activejob (= 5.2.4.5)
8+
actionmailer (5.2.4.6)
9+
actionpack (= 5.2.4.6)
10+
actionview (= 5.2.4.6)
11+
activejob (= 5.2.4.6)
1212
mail (~> 2.5, >= 2.5.4)
1313
rails-dom-testing (~> 2.0)
14-
actionpack (5.2.4.5)
15-
actionview (= 5.2.4.5)
16-
activesupport (= 5.2.4.5)
14+
actionpack (5.2.4.6)
15+
actionview (= 5.2.4.6)
16+
activesupport (= 5.2.4.6)
1717
rack (~> 2.0, >= 2.0.8)
1818
rack-test (>= 0.6.3)
1919
rails-dom-testing (~> 2.0)
2020
rails-html-sanitizer (~> 1.0, >= 1.0.2)
21-
actionview (5.2.4.5)
22-
activesupport (= 5.2.4.5)
21+
actionview (5.2.4.6)
22+
activesupport (= 5.2.4.6)
2323
builder (~> 3.1)
2424
erubi (~> 1.4)
2525
rails-dom-testing (~> 2.0)
2626
rails-html-sanitizer (~> 1.0, >= 1.0.3)
27-
activejob (5.2.4.5)
28-
activesupport (= 5.2.4.5)
27+
activejob (5.2.4.6)
28+
activesupport (= 5.2.4.6)
2929
globalid (>= 0.3.6)
30-
activemodel (5.2.4.5)
31-
activesupport (= 5.2.4.5)
30+
activemodel (5.2.4.6)
31+
activesupport (= 5.2.4.6)
3232
activemodel-serializers-xml (1.0.2)
3333
activemodel (> 5.x)
3434
activesupport (> 5.x)
3535
builder (~> 3.1)
36-
activerecord (5.2.4.5)
37-
activemodel (= 5.2.4.5)
38-
activesupport (= 5.2.4.5)
36+
activerecord (5.2.4.6)
37+
activemodel (= 5.2.4.6)
38+
activesupport (= 5.2.4.6)
3939
arel (>= 9.0)
4040
activerecord-postgis-adapter (5.2.3)
4141
activerecord (~> 5.1)
@@ -46,11 +46,11 @@ GEM
4646
multi_json (~> 1.11, >= 1.11.2)
4747
rack (>= 2.0.8, < 3)
4848
railties (>= 5.2.4.1)
49-
activestorage (5.2.4.5)
50-
actionpack (= 5.2.4.5)
51-
activerecord (= 5.2.4.5)
49+
activestorage (5.2.4.6)
50+
actionpack (= 5.2.4.6)
51+
activerecord (= 5.2.4.6)
5252
marcel (~> 0.3.1)
53-
activesupport (5.2.4.5)
53+
activesupport (5.2.4.6)
5454
concurrent-ruby (~> 1.0, >= 1.0.2)
5555
i18n (>= 0.7, < 2)
5656
minitest (~> 5.1)
@@ -142,12 +142,12 @@ GEM
142142
pg (1.2.3)
143143
protected_attributes_continued (1.8.2)
144144
activemodel (>= 5.0)
145-
pry (0.14.1)
145+
pry (0.13.1)
146146
coderay (~> 1.1)
147147
method_source (~> 1.0)
148-
pry-byebug (3.8.0)
148+
pry-byebug (3.9.0)
149149
byebug (~> 11.0)
150-
pry (~> 0.10)
150+
pry (~> 0.13.0)
151151
pry-rails (0.3.9)
152152
pry (>= 0.10.4)
153153
public_suffix (4.0.6)
@@ -158,18 +158,18 @@ GEM
158158
rack-test (1.1.0)
159159
rack (>= 1.0, < 3)
160160
railroad (0.5.0)
161-
rails (5.2.4.5)
162-
actioncable (= 5.2.4.5)
163-
actionmailer (= 5.2.4.5)
164-
actionpack (= 5.2.4.5)
165-
actionview (= 5.2.4.5)
166-
activejob (= 5.2.4.5)
167-
activemodel (= 5.2.4.5)
168-
activerecord (= 5.2.4.5)
169-
activestorage (= 5.2.4.5)
170-
activesupport (= 5.2.4.5)
161+
rails (5.2.4.6)
162+
actioncable (= 5.2.4.6)
163+
actionmailer (= 5.2.4.6)
164+
actionpack (= 5.2.4.6)
165+
actionview (= 5.2.4.6)
166+
activejob (= 5.2.4.6)
167+
activemodel (= 5.2.4.6)
168+
activerecord (= 5.2.4.6)
169+
activestorage (= 5.2.4.6)
170+
activesupport (= 5.2.4.6)
171171
bundler (>= 1.3.0)
172-
railties (= 5.2.4.5)
172+
railties (= 5.2.4.6)
173173
sprockets-rails (>= 2.0.0)
174174
rails-controller-testing (1.0.5)
175175
actionpack (>= 5.0.1.rc1)
@@ -181,9 +181,9 @@ GEM
181181
rails-html-sanitizer (1.4.2)
182182
loofah (~> 2.3)
183183
rails3-restful-authentication (3.0.1)
184-
railties (5.2.4.5)
185-
actionpack (= 5.2.4.5)
186-
activesupport (= 5.2.4.5)
184+
railties (5.2.4.6)
185+
actionpack (= 5.2.4.6)
186+
activesupport (= 5.2.4.6)
187187
method_source
188188
rake (>= 0.8.7)
189189
thor (>= 0.19.0, < 2.0)
@@ -297,7 +297,7 @@ DEPENDENCIES
297297
pry-rails
298298
rabl
299299
railroad (= 0.5.0)
300-
rails (= 5.2.4.5)
300+
rails (= 5.2.4.6)
301301
rails-controller-testing
302302
rails3-restful-authentication (~> 3.0.1)
303303
recaptcha (= 4.8.0)

0 commit comments

Comments
 (0)