Skip to content

Commit

Permalink
bump rails to 5.2.4.6
Browse files Browse the repository at this point in the history
  • Loading branch information
robkooper committed Oct 8, 2021
1 parent 16af6e4 commit da71edb
Show file tree
Hide file tree
Showing 3 changed files with 43 additions and 43 deletions.
4 changes: 2 additions & 2 deletions CHANGELOG.md
Expand Up @@ -17,7 +17,7 @@ You will need to install the latest version of BETY (or the version you want to

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

## [5.3.1] - 2021-10-07
## [5.4.0] - 2021-10-07

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

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

Expand Down
2 changes: 1 addition & 1 deletion Gemfile
@@ -1,6 +1,6 @@
source "http://rubygems.org"

gem "rails", "5.2.4.5"
gem "rails", "5.2.4.6"
# needed for rails 3.1 and above until we phase out prototype:
## gem 'prototype-rails', github: 'rails/prototype-rails', branch: '4.2' # see https://github.com/rails/prototype-rails/issues/37
gem "nokogiri"
Expand Down
80 changes: 40 additions & 40 deletions Gemfile.lock
@@ -1,41 +1,41 @@
GEM
remote: http://rubygems.org/
specs:
actioncable (5.2.4.5)
actionpack (= 5.2.4.5)
actioncable (5.2.4.6)
actionpack (= 5.2.4.6)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailer (5.2.4.5)
actionpack (= 5.2.4.5)
actionview (= 5.2.4.5)
activejob (= 5.2.4.5)
actionmailer (5.2.4.6)
actionpack (= 5.2.4.6)
actionview (= 5.2.4.6)
activejob (= 5.2.4.6)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (5.2.4.5)
actionview (= 5.2.4.5)
activesupport (= 5.2.4.5)
actionpack (5.2.4.6)
actionview (= 5.2.4.6)
activesupport (= 5.2.4.6)
rack (~> 2.0, >= 2.0.8)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.2.4.5)
activesupport (= 5.2.4.5)
actionview (5.2.4.6)
activesupport (= 5.2.4.6)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (5.2.4.5)
activesupport (= 5.2.4.5)
activejob (5.2.4.6)
activesupport (= 5.2.4.6)
globalid (>= 0.3.6)
activemodel (5.2.4.5)
activesupport (= 5.2.4.5)
activemodel (5.2.4.6)
activesupport (= 5.2.4.6)
activemodel-serializers-xml (1.0.2)
activemodel (> 5.x)
activesupport (> 5.x)
builder (~> 3.1)
activerecord (5.2.4.5)
activemodel (= 5.2.4.5)
activesupport (= 5.2.4.5)
activerecord (5.2.4.6)
activemodel (= 5.2.4.6)
activesupport (= 5.2.4.6)
arel (>= 9.0)
activerecord-postgis-adapter (5.2.3)
activerecord (~> 5.1)
Expand All @@ -46,11 +46,11 @@ GEM
multi_json (~> 1.11, >= 1.11.2)
rack (>= 2.0.8, < 3)
railties (>= 5.2.4.1)
activestorage (5.2.4.5)
actionpack (= 5.2.4.5)
activerecord (= 5.2.4.5)
activestorage (5.2.4.6)
actionpack (= 5.2.4.6)
activerecord (= 5.2.4.6)
marcel (~> 0.3.1)
activesupport (5.2.4.5)
activesupport (5.2.4.6)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
Expand Down Expand Up @@ -142,12 +142,12 @@ GEM
pg (1.2.3)
protected_attributes_continued (1.8.2)
activemodel (>= 5.0)
pry (0.14.1)
pry (0.13.1)
coderay (~> 1.1)
method_source (~> 1.0)
pry-byebug (3.8.0)
pry-byebug (3.9.0)
byebug (~> 11.0)
pry (~> 0.10)
pry (~> 0.13.0)
pry-rails (0.3.9)
pry (>= 0.10.4)
public_suffix (4.0.6)
Expand All @@ -158,18 +158,18 @@ GEM
rack-test (1.1.0)
rack (>= 1.0, < 3)
railroad (0.5.0)
rails (5.2.4.5)
actioncable (= 5.2.4.5)
actionmailer (= 5.2.4.5)
actionpack (= 5.2.4.5)
actionview (= 5.2.4.5)
activejob (= 5.2.4.5)
activemodel (= 5.2.4.5)
activerecord (= 5.2.4.5)
activestorage (= 5.2.4.5)
activesupport (= 5.2.4.5)
rails (5.2.4.6)
actioncable (= 5.2.4.6)
actionmailer (= 5.2.4.6)
actionpack (= 5.2.4.6)
actionview (= 5.2.4.6)
activejob (= 5.2.4.6)
activemodel (= 5.2.4.6)
activerecord (= 5.2.4.6)
activestorage (= 5.2.4.6)
activesupport (= 5.2.4.6)
bundler (>= 1.3.0)
railties (= 5.2.4.5)
railties (= 5.2.4.6)
sprockets-rails (>= 2.0.0)
rails-controller-testing (1.0.5)
actionpack (>= 5.0.1.rc1)
Expand All @@ -181,9 +181,9 @@ GEM
rails-html-sanitizer (1.4.2)
loofah (~> 2.3)
rails3-restful-authentication (3.0.1)
railties (5.2.4.5)
actionpack (= 5.2.4.5)
activesupport (= 5.2.4.5)
railties (5.2.4.6)
actionpack (= 5.2.4.6)
activesupport (= 5.2.4.6)
method_source
rake (>= 0.8.7)
thor (>= 0.19.0, < 2.0)
Expand Down Expand Up @@ -297,7 +297,7 @@ DEPENDENCIES
pry-rails
rabl
railroad (= 0.5.0)
rails (= 5.2.4.5)
rails (= 5.2.4.6)
rails-controller-testing
rails3-restful-authentication (~> 3.0.1)
recaptcha (= 4.8.0)
Expand Down

0 comments on commit da71edb

Please sign in to comment.