Merge branch 'main' into 20240518-v0.39.0-workaround-volume-perf

.github/workflows/main.yml

@@ -9,10 +9,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v1
-    - name: Set up Ruby 2.7
+    - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: '2.7'
         bundler-cache: true
     - name: rubocop
       run: |
@@ -25,7 +24,7 @@ jobs:
       fail-fast: false
       matrix:
         ruby_version:
-          - '2.7'
+          - '3.0'
 
     services:
       db:
@@ -68,7 +67,7 @@ jobs:
       fail-fast: false
       matrix:
         ruby_version:
-          - '2.7'
+          - '3.0'
 
     services:
       db:
@@ -107,9 +106,10 @@ jobs:
       fail-fast: false
       matrix:
         ruby_version:
-          - '2.7'
           - '3.0'
           - '3.1'
+          - '3.2'
+          - '3.3'
 
     services:
       redis:
@@ -139,8 +139,6 @@ jobs:
     - uses: actions/checkout@v1
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: '3.0'
     - name: Run setup script
       run: |
         git config --global user.email "[email protected]"
@@ -149,7 +147,7 @@ jobs:
         export SHIPIT_GEM_PATH="${PWD}"
         mkdir /tmp/new-app
         cd /tmp/new-app
-        gem install rails -v '~> 7.0.2' --no-document
+        gem install rails -v '~> 7.1.1' --no-document
         rails new shipit --skip-action-cable --skip-turbolinks --skip-action-mailer --skip-active-storage --skip-webpack-install --skip-action-mailbox --skip-action-text -m "${SHIPIT_GEM_PATH}/template.rb"
       env:
         SHIPIT_EDGE: "1"

.rubocop.yml

@@ -1,5 +1,5 @@
 AllCops:
-  TargetRubyVersion: 2.7
+  TargetRubyVersion: 3.0
   Exclude:
     - tmp/*
     - bin/*

.ruby-version

@@ -0,0 +1 @@
+3.0.3

CHANGELOG.md

@@ -1,5 +1,26 @@
 # Unreleased
 
+# 0.39.0
+
+* Minimum Ruby version is now Ruby 3.0
+* Upgraded to Rails 7.1.1
+* Upgraded Octokit to 5.6.1 (#1327)
+* Migrate from legacy Rails secrets to credentials (#1326)
+  * Rails secrets were [deprecated in Rails 7.1](https://github.com/rails/rails/pull/48472)
+  * [Guide on credentials](https://guides.rubyonrails.org/security.html#custom-credentials)
+* For deployments, `allow_concurrency` defaults to the same value as `force`. If wanted, it can be set separately by passing the intended value for `allow_concurrency` to `build_deploy` method
+
+# 0.38.0
+
+* Convert `commit_deployment_statuses.github_id` to bigint (#1312)
+* Allow to lock and archive stacks from the API (#1282)
+* Hide API tokens from the user interface after the initial creation (#1298)
+
+# 0.37.0
+
+* Suppress progress output for git checkout (#1278)
+* Make API refresh action match non-API refresh action for stacks (#1277)
+
 # 0.36.1
 
 * Fix compatibility with Rails 7.0.3.1 (YAML serialized fields). (#1273)

Gemfile

@@ -3,6 +3,7 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'sqlite3'
+gem 'ejson-rails', require: 'ejson/rails/skip_secrets'
 
 group :ci do
   gem 'mysql2'
@@ -25,5 +26,4 @@ end
 group :development, :test do
   gem 'byebug'
   gem 'pry'
-  gem 'mini_racer'
 end