From c57f058ff943c26faa5ed2e135751027182c97fa Mon Sep 17 00:00:00 2001 From: Alex Sherman Date: Thu, 14 Jan 2021 18:35:31 +0500 Subject: [PATCH 1/3] Raise ruby version --- .github/workflows/ruby.yml | 2 +- .ruby-version | 2 +- Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index eea0ccc03..166c1c447 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -17,7 +17,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-18.04] - ruby: [2.6, 2.7 ] + ruby: [ 2.7, 3.0 ] runs-on: ${{ matrix.os }} continue-on-error: ${{ endsWith(matrix.ruby, 'head') || matrix.ruby == 'debug' }} steps: diff --git a/.ruby-version b/.ruby-version index 57cf282eb..37c2961c2 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.6.5 +2.7.2 diff --git a/Dockerfile b/Dockerfile index 5d241eeef..97b0452e1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM internetee/ruby:2.6-buster +FROM internetee/ruby:2.7-buster RUN mkdir -p /opt/webapps/app/tmp/pids WORKDIR /opt/webapps/app From dda241c0dca61ae9855bc8d05f1d191089d51b15 Mon Sep 17 00:00:00 2001 From: Alex Sherman Date: Thu, 14 Jan 2021 19:35:49 +0500 Subject: [PATCH 2/3] Remove I18n gem-monkey-patching --- .github/workflows/ruby.yml | 7 +------ lib/gem_monkey_patches/i18n.rb | 1 + test/system/admin_area/prices_test.rb | 1 + 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index 166c1c447..8880e83d4 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -17,7 +17,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-18.04] - ruby: [ 2.7, 3.0 ] + ruby: [ 2.7 ] runs-on: ${{ matrix.os }} continue-on-error: ${{ endsWith(matrix.ruby, 'head') || matrix.ruby == 'debug' }} steps: @@ -100,11 +100,6 @@ jobs: - name: Give test coverage reporter executable permissions run: chmod +x cc-test-reporter - - uses: actions/download-artifact@v1 - with: - name: coverage-2.6 - path: coverage - - uses: actions/download-artifact@v1 with: name: coverage-2.7 diff --git a/lib/gem_monkey_patches/i18n.rb b/lib/gem_monkey_patches/i18n.rb index 2f7fceff7..7d0613247 100644 --- a/lib/gem_monkey_patches/i18n.rb +++ b/lib/gem_monkey_patches/i18n.rb @@ -5,6 +5,7 @@ module I18n alias_method :original_localize, :localize def localize(object, options = {}) + options.merge!({ default: '-' }) object.present? ? original_localize(object, options) : '' end end diff --git a/test/system/admin_area/prices_test.rb b/test/system/admin_area/prices_test.rb index dbb91966a..f5a299c38 100644 --- a/test/system/admin_area/prices_test.rb +++ b/test/system/admin_area/prices_test.rb @@ -20,6 +20,7 @@ class AdminAreaPricesTest < ApplicationSystemTestCase fill_in 'Valid from', with: effective_date click_on 'Create price' + assert_text 'Price has been created' assert_text I18n.localize(effective_date) end From 35a6438cf494415299a2c4bd956700ba4709828a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20V=C3=B5hmar?= Date: Tue, 26 Jan 2021 10:45:24 +0200 Subject: [PATCH 3/3] Update CHANGELOG.md --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 08f68a169..3770abd4c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +26.01.2021 +* Ruby update to 2.7 [#1791](https://github.com/internetee/registry/issues/1791) + 21.01.2021 * Registrant API: optimised contact linking [#1807](https://github.com/internetee/registry/pull/1807)