Skip to content

Commit 2a5c4d6

Browse files
committed
Bump Ruby version to 2.7.5 + Bundler 2.x
1 parent 8d29fc8 commit 2a5c4d6

File tree

3 files changed

+23
-24
lines changed

3 files changed

+23
-24
lines changed

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.5.9
1+
2.7.5

Dockerfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
FROM ruby:2.5.9
1+
FROM ruby:2.7.5
22
ARG git_sha
33
ENV LANG C.UTF-8
44
RUN apt-get update \
55
&& apt-get install --no-install-recommends -y libpq-dev postgresql-client sqlite3 libsqlite3-dev libssl-dev nodejs \
66
&& rm -rf /var/lib/apt/lists/*
7-
RUN gem install bundler -v '< 2' \
8-
&& bundle config --global frozen 1 \
7+
RUN bundle config --global frozen 1 \
98
&& bundle config github.https true \
109
&& bundle config set deployment 'true'
1110
COPY Gemfile Gemfile.lock .ruby-version /app/

Gemfile.lock

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
GIT
2-
remote: git://github.com/fusion94/paper_trail_manager.git
2+
remote: https://github.com/fusion94/paper_trail_manager.git
33
revision: b8630cd0e3318ad0929b80a701a18175402a4944
44
ref: b8630cd0e3318ad0929b80a701a18175402a4944
55
specs:
@@ -71,25 +71,25 @@ GEM
7171
activemodel-serializers-xml (~> 1.0)
7272
acts-as-taggable-on (~> 8.1)
7373
bluecloth (~> 2.2)
74-
font-awesome-rails (~> 4.7.0)
74+
font-awesome-rails (~> 4.7)
7575
formtastic (~> 4.0)
7676
geokit (>= 1.9, < 1.14)
7777
htmlentities (~> 4.3)
78-
jquery-rails (>= 4.4.0)
79-
jquery-ui-rails (>= 6.0.1)
78+
jquery-rails (~> 4.4)
79+
jquery-ui-rails (~> 6.0)
8080
loofah (~> 2.0)
8181
loofah-activerecord (>= 1.2, < 3.0)
8282
lucene_query (= 0.1)
8383
microformats (>= 4.0.7, < 4.3.0)
8484
nokogiri
8585
rack-contrib (~> 2.3)
86-
rails (~> 5.0)
86+
rails (~> 5.2)
8787
rails-observers
8888
rails_autolink (~> 1.1)
89-
recaptcha (>= 5.3)
89+
recaptcha (~> 5.8)
9090
rest-client (~> 2.0)
9191
ri_cal (~> 0.8.8)
92-
sassc-rails (>= 2.1.2)
92+
sassc-rails (~> 2.1)
9393
sunspot_rails (~> 2.1)
9494
utf8-cleaner (>= 0.0.6, < 1.1.0)
9595
validate_url
@@ -122,12 +122,12 @@ GEM
122122
faraday-patron (1.0.0)
123123
faraday-rack (1.0.0)
124124
ffi (1.15.4)
125-
font-awesome-rails (4.7.0.7)
126-
railties (>= 3.2, < 7)
125+
font-awesome-rails (4.7.0.8)
126+
railties (>= 3.2, < 8.0)
127127
formtastic (4.0.0)
128128
actionpack (>= 5.2.0)
129129
geokit (1.13.1)
130-
globalid (0.5.2)
130+
globalid (1.0.0)
131131
activesupport (>= 5.0)
132132
highline (2.0.3)
133133
htmlentities (4.3.4)
@@ -150,7 +150,7 @@ GEM
150150
activesupport (>= 4)
151151
railties (>= 4)
152152
request_store (~> 1.0)
153-
loofah (2.12.0)
153+
loofah (2.13.0)
154154
crass (~> 1.0.2)
155155
nokogiri (>= 1.5.9)
156156
loofah-activerecord (2.0.0)
@@ -163,12 +163,12 @@ GEM
163163
microformats (4.2.1)
164164
json (~> 2.2)
165165
nokogiri (~> 1.10)
166-
mime-types (3.3.1)
166+
mime-types (3.4.1)
167167
mime-types-data (~> 3.2015)
168-
mime-types-data (3.2021.0901)
168+
mime-types-data (3.2021.1115)
169169
mini_mime (1.1.2)
170170
mini_portile2 (2.6.1)
171-
minitest (5.14.4)
171+
minitest (5.15.0)
172172
multi_json (1.15.0)
173173
multipart-post (2.1.1)
174174
netrc (0.11.0)
@@ -243,7 +243,7 @@ GEM
243243
mime-types (>= 1.16, < 4.0)
244244
netrc (~> 0.8)
245245
ri_cal (0.8.8)
246-
rsolr (2.3.0)
246+
rsolr (2.4.0)
247247
builder (>= 2.1.2)
248248
faraday (>= 0.9.0)
249249
rspec-core (3.9.3)
@@ -289,9 +289,9 @@ GEM
289289
sprockets (3.7.2)
290290
concurrent-ruby (~> 1.0)
291291
rack (> 1, < 3)
292-
sprockets-rails (3.2.2)
293-
actionpack (>= 4.0)
294-
activesupport (>= 4.0)
292+
sprockets-rails (3.4.2)
293+
actionpack (>= 5.2)
294+
activesupport (>= 5.2)
295295
sprockets (>= 3.0.0)
296296
sqlite3 (1.4.2)
297297
sunspot (2.5.0)
@@ -340,7 +340,7 @@ DEPENDENCIES
340340
paper_trail_manager!
341341
progress_bar
342342
puma
343-
rails (~> 5.0)
343+
rails (~> 5.2)
344344
rails_12factor
345345
rake (< 11.0)
346346
recaptcha
@@ -353,4 +353,4 @@ DEPENDENCIES
353353
web-console (~> 2.0)
354354

355355
BUNDLED WITH
356-
1.17.3
356+
2.1.4

0 commit comments

Comments
 (0)