Skip to content

Commit

Permalink
tech: bump ruby to 3.1.1
Browse files Browse the repository at this point in the history
  • Loading branch information
kugaevsky committed Feb 28, 2022
1 parent b087620 commit c5e0787
Show file tree
Hide file tree
Showing 8 changed files with 48 additions and 31 deletions.
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.7.1
3.1.1
6 changes: 4 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# frozen_string_literal: true

ruby '2.7.1'
ruby '3.1.1'

source 'https://rubygems.org'

Expand All @@ -17,6 +17,8 @@ gem 'sidekiq', '>= 5.2.7'

# Integrations
gem 'http'
gem 'net-smtp'
gem 'net-pop'
gem 'multipart-post'
gem 'mailchimp-api', require: 'mailchimp'
gem 'mailgun-ruby'
Expand Down Expand Up @@ -101,7 +103,7 @@ gem 'icalendar'

group :development do
# Access an IRB console on exception pages or by using <%= console %> anywhere in the code.
gem 'listen', '~> 3.2.0'
gem 'listen'
gem 'web-console', '>= 3.7.0'
# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
gem 'spring'
Expand Down
56 changes: 34 additions & 22 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ GEM
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
active_model_serializers (0.10.10)
actionpack (>= 4.1, < 6.1)
activemodel (>= 4.1, < 6.1)
active_model_serializers (0.10.13)
actionpack (>= 4.1, < 7.1)
activemodel (>= 4.1, < 7.1)
case_transform (>= 0.2)
jsonapi-renderer (>= 0.1.1.beta1, < 0.3)
activejob (6.0.4.6)
Expand All @@ -73,8 +73,8 @@ GEM
minitest (~> 5.1)
tzinfo (~> 1.1)
zeitwerk (~> 2.2, >= 2.2.2)
acts-as-taggable-on (6.5.0)
activerecord (>= 5.0, < 6.1)
acts-as-taggable-on (9.0.1)
activerecord (>= 6.0, < 7.1)
addressable (2.8.0)
public_suffix (>= 2.0.2, < 5.0)
airbrussh (1.4.0)
Expand Down Expand Up @@ -137,6 +137,7 @@ GEM
responders
warden (~> 1.2.3)
diff-lcs (1.5.0)
digest (3.1.0)
docile (1.4.0)
domain_name (0.5.20190701)
unf (>= 0.0.5, < 1.0.0)
Expand Down Expand Up @@ -211,9 +212,10 @@ GEM
icalendar (2.7.1)
ice_cube (~> 0.16)
ice_cube (0.16.4)
image_processing (1.10.0)
image_processing (1.12.1)
mini_magick (>= 4.9.5, < 5)
ruby-vips (>= 2.0.13, < 3)
ruby-vips (>= 2.0.17, < 3)
io-wait (0.2.1)
ipaddress (0.8.3)
jbuilder (2.11.5)
actionview (>= 5.0.0)
Expand All @@ -237,7 +239,7 @@ GEM
addressable (~> 2.7)
letter_opener (1.7.0)
launchy (~> 2.2)
listen (3.2.0)
listen (3.7.1)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
llhttp-ffi (0.4.0)
Expand Down Expand Up @@ -268,8 +270,19 @@ GEM
multi_json (1.15.0)
multi_xml (0.6.0)
multipart-post (2.1.1)
net-pop (0.1.1)
digest
net-protocol
timeout
net-protocol (0.1.2)
io-wait
timeout
net-scp (3.0.0)
net-ssh (>= 2.6.5, < 7.0.0)
net-smtp (0.3.1)
digest
net-protocol
timeout
net-ssh (6.1.0)
netrc (0.11.0)
newrelic_rpm (8.5.0)
Expand Down Expand Up @@ -320,8 +333,6 @@ GEM
method_source (~> 1.0)
pry-rails (0.3.9)
pry (>= 0.10.4)
psych (4.0.3)
stringio
public_suffix (2.0.5)
puma (5.6.2)
nio4r (~> 2.0)
Expand Down Expand Up @@ -370,11 +381,10 @@ GEM
thor (>= 0.20.3, < 2.0)
rainbow (3.1.1)
rake (13.0.6)
rb-fsevent (0.10.3)
rb-fsevent (0.11.1)
rb-inotify (0.10.1)
ffi (~> 1.0)
rdoc (6.4.0)
psych (>= 4.0.0)
rdoc (6.3.3)
redcarpet (3.5.1)
redis (4.6.0)
regexp_parser (2.2.1)
Expand Down Expand Up @@ -448,8 +458,8 @@ GEM
sprockets (> 3.0)
sprockets-rails
tilt
sdoc (1.0.0)
rdoc (>= 5.0)
sdoc (2.3.1)
rdoc (>= 5.0, < 6.4.0)
semantic_range (3.0.0)
shoulda-matchers (5.1.0)
activesupport (>= 5.2.0)
Expand Down Expand Up @@ -491,12 +501,12 @@ GEM
net-scp (>= 1.1.2)
net-ssh (>= 2.8.0)
ssrf_filter (1.0.7)
stringio (3.0.1)
temple (0.8.2)
test-prof (1.0.7)
thor (1.2.1)
thread_safe (0.3.6)
tilt (2.0.10)
timeout (0.2.0)
tzinfo (1.2.9)
thread_safe (~> 0.1)
uglifier (4.2.0)
Expand All @@ -508,11 +518,11 @@ GEM
unicode-display_width (2.1.0)
warden (1.2.9)
rack (>= 2.0.9)
web-console (3.7.0)
actionview (>= 5.0)
activemodel (>= 5.0)
web-console (4.2.0)
actionview (>= 6.0.0)
activemodel (>= 6.0.0)
bindex (>= 0.4.0)
railties (>= 5.0)
railties (>= 6.0.0)
webmock (3.14.0)
addressable (>= 2.8.0)
crack (>= 0.3.2)
Expand Down Expand Up @@ -563,11 +573,13 @@ DEPENDENCIES
jwt
kaminari (>= 1.2.1)
letter_opener
listen (~> 3.2.0)
listen
mailchimp-api
mailgun-ruby
meta-tags (>= 2.13.0)
multipart-post
net-pop
net-smtp
newrelic_rpm
oj
omniauth (>= 1.9.0)
Expand Down Expand Up @@ -617,7 +629,7 @@ DEPENDENCIES
webpacker

RUBY VERSION
ruby 2.7.1p83
ruby 3.1.1p18

BUNDLED WITH
2.3.8
2 changes: 1 addition & 1 deletion app/decorators/event_decorator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ def time_distance

def link_to_place
base = 'http://maps.yandex.ru/?text='
h.link_to URI.encode(base + object.place), target: '_blank', itemprop: 'location', itemscope: true, itemtype: 'http://schema.org/Place', rel: 'noopener' do
h.link_to CGI.escape(base + object.place), target: '_blank', itemprop: 'location', itemscope: true, itemtype: 'http://schema.org/Place', rel: 'noopener' do
link_arr = [h.content_tag(:span, object.place, itemprop: 'address')]
if object.address_comment.present?
link_arr << h.content_tag(:span, object.address_comment, itemprop: 'name')
Expand Down
4 changes: 2 additions & 2 deletions config/database.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ development:
username: postgres
password: postgres
pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
host: postgres
host: localhost
timeout: 5000
database: it52_rails_dev

development:
test:
adapter: postgresql
encoding: unicode
username: postgres
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:2.7.1-alpine
FROM ruby:3.1.1-alpine

RUN apk add --no-cache build-base \
postgresql-dev \
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.production
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:2.7.1-alpine
FROM ruby:3.1.1-alpine

RUN apk add --no-cache build-base \
postgresql-dev \
Expand Down
5 changes: 4 additions & 1 deletion docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,15 @@ services:
- postgres:/var/lib/postgresql/data
env_file:
- '../.env'
ports:
- '5432:5432'

redis:
image: redis:alpine
volumes:
- 'redis:/data'

ports:
- '6379:6379'
rails:
image: ${COMPOSE_PROJECT_NAME}/rails:latest
build:
Expand Down

0 comments on commit c5e0787

Please sign in to comment.