Skip to content

Commit

Permalink
Bump Ruby and Rails (#750)
Browse files Browse the repository at this point in the history 
* Bump Ruby and Rails

* Update changelog
  • Loading branch information
@talyssonoc
talyssonoc authored Jul 12, 2021
1 parent 0446572 commit ad0cf16
Show file tree
Hide file tree
Showing 3 changed files with 74 additions and 66 deletions.
10 changes: 9 additions & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@

## [Unreleased]

## [2.7.1] 2021-07-12

### Update

- Ruby to 2.6.8
- Rails to 5.2.5

## [2.7.0] 2021-07-12

### Fixed
Expand Down Expand Up @@ -615,7 +622,7 @@
The format is based on [Keep a Changelog](http://keepachangelog.com)
and this project adheres to [Semantic Versioning](http://semver.org).

[unreleased]: https://github.com/Codeminer42/cm42-central/compare/v2.7.0...HEAD
[unreleased]: https://github.com/Codeminer42/cm42-central/compare/v2.7.1...HEAD
[1.0.0]: https://github.com/Codeminer42/cm42-central/tree/v1.0.0
[1.1.0]: https://github.com/Codeminer42/cm42-central/tree/v1.1.0
[1.1.1]: https://github.com/Codeminer42/cm42-central/tree/v1.1.1
Expand Down Expand Up @@ -656,3 +663,4 @@ and this project adheres to [Semantic Versioning](http://semver.org).
[2.5.0]: https://github.com/Codeminer42/cm42-central/tree/v2.5.0
[2.6.0]: https://github.com/Codeminer42/cm42-central/tree/v2.6.0
[2.7.0]: https://github.com/Codeminer42/cm42-central/tree/v2.7.0
[2.7.1]: https://github.com/Codeminer42/cm42-central/tree/v2.7.1
4 changes: 2 additions & 2 deletions Gemfile
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
source 'https://rubygems.org'

ruby '2.6.0'
ruby '2.6.8'

git_source(:github) do |repo_name|
repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
"https://github.com/#{repo_name}.git"
end

gem 'rails', '~>5.2.2'
gem 'rails', '~>5.2.5'

gem 'activeadmin'
gem 'api-pagination'
Expand Down
126 changes: 63 additions & 63 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,25 +14,25 @@ GEM
specs:
acme-client (0.4.1)
faraday (~> 0.9, >= 0.9.1)
actioncable (5.2.2)
actionpack (= 5.2.2)
actioncable (5.2.6)
actionpack (= 5.2.6)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailer (5.2.2)
actionpack (= 5.2.2)
actionview (= 5.2.2)
activejob (= 5.2.2)
actionmailer (5.2.6)
actionpack (= 5.2.6)
actionview (= 5.2.6)
activejob (= 5.2.6)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (5.2.2)
actionview (= 5.2.2)
activesupport (= 5.2.2)
rack (~> 2.0)
actionpack (5.2.6)
actionview (= 5.2.6)
activesupport (= 5.2.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.2)
activesupport (= 5.2.2)
actionview (5.2.6)
activesupport (= 5.2.6)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
Expand All @@ -49,20 +49,20 @@ GEM
ransack (>= 1.8.7)
sass (~> 3.1)
sprockets (< 4.1)
activejob (5.2.2)
activesupport (= 5.2.2)
activejob (5.2.6)
activesupport (= 5.2.6)
globalid (>= 0.3.6)
activemodel (5.2.2)
activesupport (= 5.2.2)
activerecord (5.2.2)
activemodel (= 5.2.2)
activesupport (= 5.2.2)
activemodel (5.2.6)
activesupport (= 5.2.6)
activerecord (5.2.6)
activemodel (= 5.2.6)
activesupport (= 5.2.6)
arel (>= 9.0)
activestorage (5.2.2)
actionpack (= 5.2.2)
activerecord (= 5.2.2)
marcel (~> 0.3.1)
activesupport (5.2.2)
activestorage (5.2.6)
actionpack (= 5.2.6)
activerecord (= 5.2.6)
marcel (~> 1.0.0)
activesupport (5.2.6)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
Expand Down Expand Up @@ -96,7 +96,7 @@ GEM
bootstrap-sass (3.4.1)
autoprefixer-rails (>= 5.2.1)
sassc (>= 2.0.0)
builder (3.2.3)
builder (3.2.4)
bullet (5.9.0)
activesupport (>= 3.0.0)
uniform_notifier (~> 1.11)
Expand Down Expand Up @@ -147,13 +147,13 @@ GEM
compass (~> 1.0.0)
sass-rails (< 5.1)
sprockets (< 4.0)
concurrent-ruby (1.1.5)
concurrent-ruby (1.1.9)
configuration (1.3.4)
connection_pool (2.2.2)
cookiejar (0.3.3)
crack (0.4.3)
safe_yaml (~> 1.0.0)
crass (1.0.4)
crass (1.0.6)
cypress-on-rails (1.5.0)
rack
daemons (1.3.1)
Expand Down Expand Up @@ -199,7 +199,7 @@ GEM
enumerize (2.3.1)
activesupport (>= 3.2)
equalizer (0.0.11)
erubi (1.8.0)
erubi (1.10.0)
erubis (2.7.0)
eventmachine (1.2.7)
excon (0.62.0)
Expand Down Expand Up @@ -249,7 +249,7 @@ GEM
domain_name (~> 0.5)
http_parser.rb (0.6.0)
httpclient (2.8.3)
i18n (1.6.0)
i18n (1.8.10)
concurrent-ruby (~> 1.0)
i18n-js (3.2.1)
i18n (>= 0.6.6)
Expand Down Expand Up @@ -292,23 +292,21 @@ GEM
actionmailer (>= 3.2)
letter_opener (~> 1.0)
railties (>= 3.2)
loofah (2.2.3)
loofah (2.10.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.1)
mini_mime (>= 0.1.1)
marcel (0.3.3)
mimemagic (~> 0.3.2)
marcel (1.0.1)
material_icons (2.2.1)
railties (>= 3.2)
method_source (0.9.2)
mime-types (3.2.2)
mime-types-data (~> 3.2015)
mime-types-data (3.2018.0812)
mimemagic (0.3.3)
mini_mime (1.0.1)
mini_portile2 (2.4.0)
minitest (5.11.3)
mini_mime (1.1.0)
mini_portile2 (2.5.3)
minitest (5.14.4)
moneta (1.0.0)
multi_json (1.13.1)
multipart-post (2.0.0)
Expand All @@ -317,9 +315,10 @@ GEM
mustermann (~> 1.0.0)
netrc (0.11.0)
newrelic_rpm (6.1.0.352)
nio4r (2.3.1)
nokogiri (1.10.1)
mini_portile2 (~> 2.4.0)
nio4r (2.5.7)
nokogiri (1.11.7)
mini_portile2 (~> 2.5.0)
racc (~> 1.4)
orm_adapter (0.5.0)
parallel (1.14.0)
parser (2.6.0.0)
Expand Down Expand Up @@ -354,7 +353,8 @@ GEM
multi_json (~> 1.6)
thin (~> 1.5)
pusher-signature (0.1.8)
rack (2.0.6)
racc (1.5.2)
rack (2.2.3)
rack-accept (0.4.5)
rack (>= 0.4)
rack-cache (1.9.0)
Expand All @@ -367,18 +367,18 @@ GEM
rack-test (1.1.0)
rack (>= 1.0, < 3)
rack-timeout (0.5.1)
rails (5.2.2)
actioncable (= 5.2.2)
actionmailer (= 5.2.2)
actionpack (= 5.2.2)
actionview (= 5.2.2)
activejob (= 5.2.2)
activemodel (= 5.2.2)
activerecord (= 5.2.2)
activestorage (= 5.2.2)
activesupport (= 5.2.2)
rails (5.2.6)
actioncable (= 5.2.6)
actionmailer (= 5.2.6)
actionpack (= 5.2.6)
actionview (= 5.2.6)
activejob (= 5.2.6)
activemodel (= 5.2.6)
activerecord (= 5.2.6)
activestorage (= 5.2.6)
activesupport (= 5.2.6)
bundler (>= 1.3.0)
railties (= 5.2.2)
railties (= 5.2.6)
sprockets-rails (>= 2.0.0)
rails-assets-jquery (3.3.1)
rails-assets-jquery.gritter (1.7.4)
Expand All @@ -390,8 +390,8 @@ GEM
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.0.4)
loofah (~> 2.2, >= 2.2.2)
rails-html-sanitizer (1.3.0)
loofah (~> 2.3)
rails-i18n (5.1.3)
i18n (>= 0.7, < 2)
railties (>= 5.0, < 6)
Expand All @@ -400,14 +400,14 @@ GEM
rails_stdout_logging
rails_serve_static_assets (0.0.5)
rails_stdout_logging (0.0.5)
railties (5.2.2)
actionpack (= 5.2.2)
activesupport (= 5.2.2)
railties (5.2.6)
actionpack (= 5.2.6)
activesupport (= 5.2.6)
method_source
rake (>= 0.8.7)
thor (>= 0.19.0, < 2.0)
rainbow (3.0.0)
rake (12.3.2)
rake (13.0.6)
ransack (2.1.1)
actionpack (>= 5.0)
activerecord (>= 5.0)
Expand Down Expand Up @@ -509,7 +509,7 @@ GEM
sprockets (3.7.2)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.2.1)
sprockets-rails (3.2.2)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
Expand All @@ -522,7 +522,7 @@ GEM
tilt (2.0.9)
timecop (0.9.1)
transitions (0.1.13)
tzinfo (1.2.5)
tzinfo (1.2.9)
thread_safe (~> 0.1)
uglifier (4.1.20)
execjs (>= 0.3.0, < 3)
Expand All @@ -549,9 +549,9 @@ GEM
activesupport (>= 4.2)
rack-proxy (>= 0.6.1)
railties (>= 4.2)
websocket-driver (0.7.0)
websocket-driver (0.7.5)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.3)
websocket-extensions (0.1.5)
xpath (3.2.0)
nokogiri (~> 1.8)

Expand Down Expand Up @@ -618,7 +618,7 @@ DEPENDENCIES
rack-cache
rack-cors
rack-timeout
rails (~> 5.2.2)
rails (~> 5.2.5)
rails-assets-jquery.gritter!
rails-controller-testing
rails-i18n
Expand Down Expand Up @@ -648,7 +648,7 @@ DEPENDENCIES
webpacker (>= 4.0.x)

RUBY VERSION
ruby 2.6.0p0
ruby 2.6.8p205

BUNDLED WITH
1.17.3

0 comments on commit ad0cf16

Please sign in to comment.