Skip to content
This repository has been archived by the owner on Mar 20, 2023. It is now read-only.

Fixes for hyrax 4.0.0.beta1 #424

Merged
merged 3 commits into from
Aug 5, 2022
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 .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ jobs:
parameters:
ruby_version:
type: string
default: 2.6.7
default: 2.7.6
bundler_version:
type: string
default: 2.2.30
default: 2.3.17
environment:
DATABASE_URL: postgresql://[email protected]/circle_test
DATABASE_NAME: circle_test
Expand Down Expand Up @@ -61,10 +61,10 @@ jobs:
parameters:
ruby_version:
type: string
default: 2.6.7
default: 2.7.6
bundler_version:
type: string
default: 2.2.30
default: 2.3.17
executor:
name: samvera/ruby_fcrepo_solr_redis_postgres
ruby_version: << parameters.ruby_version >>
Expand Down
6 changes: 3 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,18 @@ git_source(:github) do |repo_name|
"https://github.com/#{repo_name}.git"
end

gem "actionview", ">= 5.1.6.2"
gem 'dotenv-rails'
gem 'honeybadger', '~> 3.1'
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 5.1'
gem 'rails', '6.0.5.1'
# Use sqlite3 as the database for Active Record
gem 'sqlite3'
# Use postgresql on the sandbox
gem 'pg'
# Use Puma as the app server
gem 'puma', '~> 4.3'
# Use SCSS for stylesheets
gem 'sass-rails', '~> 5.0'
gem 'sass-rails', '~> 6.0'
# Use Uglifier as compressor for JavaScript assets
gem 'uglifier', '>= 1.3.0'
# Use CoffeeScript for .coffee assets and views
Expand Down Expand Up @@ -72,6 +71,7 @@ end

gem 'hyrax', github: 'samvera/hyrax', branch: ENV['HYRAX_TARGET'] || 'main'
# gem 'hyrax', '2.1.0'
gem 'bootstrap', '~> 4.0'
gem 'devise'
gem 'devise-i18n'
gem 'devise-guests', '~> 0.6'
Expand Down
Loading