Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
# [Choice] Ruby version (use -bullseye variants on local arm64/Apple Silicon): 3, 3.1, 3.0, 2, 2.7, 2.6, 3-bullseye, 3.1-bullseye, 3.0-bullseye, 2-bullseye, 2.7-bullseye, 2.6-bullseye, 3-buster, 3.1-buster, 3.0-buster, 2-buster, 2.7-buster, 2.6-buster
ARG VARIANT="3.3.4"
ARG VARIANT="3.4.5"
FROM ghcr.io/rails/devcontainer/images/ruby:${VARIANT}

# Default value to allow debug server to serve content over GitHub Codespace's port forwarding service
# The value is a comma-separated list of allowed domains
ENV RAILS_DEVELOPMENT_HOSTS=".githubpreview.dev"

# [Optional] Uncomment this section to install additional OS packages.
RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
&& apt-get -y install --no-install-recommends cmake pkg-config
RUN sudo apt-get update && export DEBIAN_FRONTEND=noninteractive \
&& sudo apt-get -y install --no-install-recommends cmake pkg-config

# [Optional] Uncomment this line to install additional gems.
# RUN gem install <your-gem-names-here>
Expand All @@ -17,4 +17,4 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
# RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && npm install -g <your-package-here>" 2>&1

# Donwload rails repository locally to do calculations on the repository
RUN git clone --mirror https://github.com/rails/rails.git
RUN sudo git clone --mirror https://github.com/rails/rails.git
2 changes: 1 addition & 1 deletion .devcontainer/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ services:
# Update 'VARIANT' to pick a version of Ruby: 3, 3.1, 3.0, 2, 2.7, 2.6
# Append -bullseye or -buster to pin to an OS version.
# Use -bullseye variants on local arm64/Apple Silicon.
VARIANT: "3.3.4"
VARIANT: "3.4.5"

volumes:
- ..:/workspaces:cached
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 3.3.4
ruby-version: 3.4.5
bundler-cache: true

- name: Run tests
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.3.4
3.4.5
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# * .ruby-version (used by CircleCI).
# * Install the version by hand in the server (uses RVM).
#
FROM ruby:3.3.4-alpine3.20
FROM ruby:3.4.5-alpine3.22

# LANG as recommended in the Encoding section of https://hub.docker.com/_/ruby/.
ENV LANG C.UTF-8
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ruby '3.3.4'
ruby '3.4.5'

source 'https://rubygems.org'
git_source(:github) { |repo| "https://github.com/#{repo}.git" }
Expand Down
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ DEPENDENCIES
web-console (>= 3.3.0)

RUBY VERSION
ruby 3.3.4p94
ruby 3.4.5p51

BUNDLED WITH
2.5.17
4 changes: 3 additions & 1 deletion app/models/commit.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen-string-literal: true

class Commit < ApplicationRecord
has_many :contributions, dependent: :destroy
has_many :contributors, through: :contributions
Expand Down Expand Up @@ -196,7 +198,7 @@ def cache_diff(repo)
# git show, and is an expensive operation. So, we do this only for those
# commits where this is needed, and cache the result in the database.
def extract_changelog
changelog = ''
changelog = +''
in_changelog = false
diff.each_line do |line|
if line =~ /^diff --git/
Expand Down
2 changes: 1 addition & 1 deletion config/deploy/production.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
set :puma_workers, 1
set :puma_phased_restart, true

set :rvm_ruby_version, '3.3.4'
set :rvm_ruby_version, '3.4.5'
set :rvm_custom_path, '/home/rails/.rvm'

namespace :deploy do
Expand Down
8 changes: 5 additions & 3 deletions test/models/commit_test.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen-string-literal: true

require 'test_helper'
require 'ostruct'

Expand All @@ -22,7 +24,7 @@ def test_import
tcomm = Time.current
tauth = 1.day.ago

message = <<-MSG.strip_heredoc
message = +<<-MSG.strip_heredoc
\u{1f4a3}

We are relying on hash inequality in tests
Expand All @@ -32,8 +34,8 @@ def test_import
sha1 = "b5ed79468289c15a685a82694dcf1adf773c91d#{i}"
rugged_commit = OpenStruct.new
rugged_commit.oid = sha1
rugged_commit.author = {name: 'Juanjo', email: 'juanjo@example.com', time: tauth}
rugged_commit.committer = {name: 'David', email: 'david@example.com', time: tcomm}
rugged_commit.author = {name: +'Juanjo', email: +'juanjo@example.com', time: tauth}
rugged_commit.committer = {name: +'David', email: +'david@example.com', time: tcomm}
rugged_commit.message = message
rugged_commit.parents = parents

Expand Down