Skip to content

Commit d84db2d

Browse files
authored
Merge pull request #275 from learningtapestry/ruby-3.2.9
Bump Ruby to 3.2.9
2 parents 29c31bd + 6fb3401 commit d84db2d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+561
-514
lines changed

.codeship/rubygems-version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
3.4.12

.codeship/setup.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22

3-
gem update --system 3.4.12
3+
gem update --system "$(cat .codeship/rubygems-version)"
44
gem install bundler:2.4.12
55

66
bundle _2.4.12_ install

.rubocop.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,11 @@ Metrics/MethodLength:
5757
Metrics/PerceivedComplexity:
5858
Max: 10
5959

60+
Naming/PredicateMethod:
61+
AllowedMethods:
62+
- call
63+
- save
64+
6065
Naming/MethodParameterName:
6166
MinNameLength: 2
6267

@@ -84,3 +89,6 @@ Style/PercentLiteralDelimiters:
8489

8590
Style/RescueModifier:
8691
Enabled: false
92+
93+
Style/SafeNavigationChainLength:
94+
Max: 3

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.2.1
1+
3.2.9

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1212

1313
### Changed
1414

15+
- Bump ruby to 3.2.9
1516
- [BREAKING] Update CKEditor version (see [CKEditor usage](docs/ckeditor-usage.md)) - [@paranoicsan](https://github.com/paranoicsan)
1617
- [BREAKING] Refactor query handling in admin controllers - [@paranoicsan](https://github.com/paranoicsan)
1718
- [BREAKING] Rename `import_status_for` to `import_status_for_nested` inside `Lcms::Engine::NestedReimportable` - [@paranoicsan](https://github.com/paranoicsan)

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ruby:3.2.1
1+
FROM ruby:3.2.9
22

33
ENV APP_PATH=/app/
44
ENV LANG=C.UTF-8
@@ -11,14 +11,14 @@ RUN apt-get autoclean \
1111
&& apt-get install -y --no-install-recommends \
1212
build-essential \
1313
chromium-driver \
14-
postgresql-client-13 \
14+
postgresql-client \
1515
shellcheck \
1616
tzdata \
1717
&& rm -r /var/lib/apt/lists/* /var/cache/apt/*
1818

1919
# install specific wkhtmltopdf binary
2020
RUN apt-get update -qqy \
21-
&& WK_VERSION=0.12.6.1-2 \
21+
&& WK_VERSION=0.12.6.1-3 \
2222
&& ARCH=$(dpkg --print-architecture) \
2323
&& CODENAME=$(. /etc/os-release; echo $VERSION_CODENAME) \
2424
&& curl -LSfso wkhtmltopdf.deb https://github.com/wkhtmltopdf/packaging/releases/download/$WK_VERSION/wkhtmltox_$WK_VERSION.${CODENAME}_$ARCH.deb \

Gemfile

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,6 @@ gemspec
1616
# To use a debugger
1717
# gem 'byebug', group: [:development, :test]
1818

19-
gem 'lt-google-api', github: 'learningtapestry/lt-google-api',
20-
branch: 'ruby-3-upgrade',
21-
ref: '08cece7'
22-
23-
gem 'lt-lcms', github: 'learningtapestry/lt-lcms',
24-
branch: 'ruby-3-upgrade',
25-
ref: 'a673e78'
26-
2719
gem 'wicked_pdf', github: 'learningtapestry/wicked_pdf',
2820
branch: 'puppeteer-support',
2921
ref: '50d961e'

0 commit comments

Comments
 (0)