Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

3624 - Upgrade rails #4237

Open
wants to merge 3 commits into
base: development
Choose a base branch
from
Open
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- name: Install Ruby and gems
uses: ruby/setup-ruby@v1
with:
ruby-version: 2.7.3
ruby-version: 3.3.3
bundler-cache: true
- name: Install dependencies
run: |
Expand Down
5 changes: 5 additions & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
inherit_mode:
merge:
- Exclude

inherit_from: config/rubocop/.rubocop.yml
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.7.3
3.3.3
37 changes: 19 additions & 18 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
# frozen_string_literal: true

source 'https://rubygems.org'

ruby '2.7.3'
ruby '3.3.3'

gem 'rails', '6.1.7.6'
gem 'rails', '~> 7.1.3'

gem 'capistrano', '~> 3.10', require: false
gem 'capistrano-bundler', '~> 1.6'
gem 'capistrano-rails', '~> 1.4', require: false
gem 'html-pipeline', '~> 2.14'
gem 'interactor-rails'
gem 'jquery-rails'
gem 'jquery-ui-sass-rails'
gem 'mysql2'
gem 'net-pop', github: 'ruby/net-pop'
gem 'nkf'
gem 'nokogiri'
gem 'postmark-rails'
gem 'recaptcha', require: 'recaptcha/rails'
Expand All @@ -20,7 +22,7 @@ gem 'ruby-openai'
gem 'rvm1-capistrano3', require: false
gem 'savon', '~> 2.12.0'
gem 'text'
gem 'thredded', '~> 1.0'
gem 'thredded', '~> 1.1'
gem 'will_paginate'

gem 'acts_as_list'
Expand All @@ -43,10 +45,10 @@ gem 'oink'
gem 'pry'

gem 'iiif-image-api', git: 'https://github.com/samvera-labs/iiif-image-api.git', branch: 'main'
gem 'iiif-presentation', git: 'https://github.com/benwbrum/osullivan', branch: 'service_is_array'
gem 'riiif', git: 'https://github.com/BrumfieldLabs/riiif.git', branch: 'quote-paths-for-shell'
gem 'iiif-presentation'
gem 'riiif'

gem 'omniauth', '~> 1.9.2'
gem 'omniauth', '~> 2.0'
gem 'omniauth-google-oauth2'
gem 'omniauth-multi-provider', '~> 0.2.1'
gem 'omniauth-saml'
Expand All @@ -62,7 +64,7 @@ gem 'active_link_to'
gem 'warning'

gem 'http_accept_language'
gem 'rails-i18n', '~> 6.0.0'
gem 'rails-i18n'

gem 'charlock_holmes'
gem 'forty_facets'
Expand All @@ -71,9 +73,6 @@ gem 'diffy'
gem 'edtf'
gem 'edtf-humanize'
gem 'terser'

gem 'interactor-rails', '~> 2.0'

group :assets do
gem 'uglifier'
end
Expand All @@ -93,19 +92,22 @@ group :development, :test do
gem 'better_errors'
gem 'binding_of_caller'
gem 'bullet'
gem 'dotenv-rails'
gem 'easy_translate'
gem 'factory_bot_rails'
gem 'fuubar'
gem 'i18n-tasks'
gem 'launchy'
gem 'listen'
gem 'pry-awesome_print'
gem 'pry-byebug'
gem 'rspec-rails'
gem 'rubocop'
gem 'rubocop-factory_bot'
gem 'rubocop-performance'
gem 'rubocop-rails'
gem 'rubocop-rspec'
end

gem 'dotenv', group: [:development, :test], require: 'dotenv/load'

# Use SassC for stylesheets
gem 'sassc-rails'

Expand All @@ -116,7 +118,7 @@ gem 'autoprefixer-rails'
gem 'slim'

# Gravatar Image Tag
gem 'gravatar_image_tag'
gem 'gravatar_image_tag', github: 'Tinix/gravatar_image_tag'

# Admin masquerade as a user
gem 'devise_masquerade', '~> 1.2.0'
Expand All @@ -141,6 +143,5 @@ gem 'newrelic_rpm'
gem 'open3'

# Copy to clipboard
gem 'clipboard-rails'

gem 'ajax-datatables-rails', '~> 1.0.0'
gem 'clipboard-rails'
Loading
Loading