Skip to content

Commit

Permalink
Merge pull request #1313 from openjournals/main
Browse files Browse the repository at this point in the history
Merge latest changes into JOSE
  • Loading branch information
xuanxu authored Feb 15, 2024
2 parents 3692434 + 801625d commit 03f6d9c
Show file tree
Hide file tree
Showing 30 changed files with 502 additions and 270 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- name: Install Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 3.2.2
ruby-version: 3.3.0
bundler-cache: true
- name: Install Elasticsearch
uses: ankane/setup-elasticsearch@v1
Expand Down
18 changes: 18 additions & 0 deletions .readthedocs.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Read the Docs configuration file for Sphinx projects
# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
# Required
version: 2

# Set the OS, Python version and other tools you might need
build:
os: ubuntu-22.04
tools:
python: "3.12"

# Build documentation in the "docs/" directory with Sphinx
sphinx:
configuration: docs/conf.py

python:
install:
- requirements: docs/requirements.txt
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.2.2
3.3.0
15 changes: 7 additions & 8 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
source 'https://rubygems.org'
ruby '3.2.2'
ruby '3.3.0'

gem 'aasm', '~> 5.5.0'
gem 'chartkick'
Expand All @@ -14,11 +14,11 @@ gem 'net-sftp', '~> 4.0'
gem 'octicons_helper'
gem 'omniauth-orcid', '~> 2.1.1'
gem 'omniauth-rails_csrf_protection'
gem 'octokit', '~> 6.0'
gem 'octokit'
gem 'pdf-reader', '~> 2.11.0'
gem 'pg', '~> 1.4.6'
gem 'pagy'
gem 'rails', '7.1.0'
gem 'rails', '7.1.3'
gem "importmap-rails"
gem "turbo-rails"
gem "stimulus-rails"
Expand Down Expand Up @@ -49,20 +49,19 @@ group :development, :test do
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
gem 'pry-byebug'
gem 'capybara', '~> 3.39'
gem 'factory_bot_rails', '~> 6.2.0'
gem 'rspec-rails', '~> 6.0.3'
gem 'rails-controller-testing', '~> 1.0.5'
gem 'factory_bot_rails', '~> 6.4.2'
gem 'rspec-rails', '~> 6.1.0'
gem 'selenium-webdriver'
gem 'webmock'
end

group :test do
gem 'vcr', '~> 6.1', '>= 6.1.0'
gem 'vcr', '~> 6.2'
end

group :development do
# Access an IRB console on exception pages or by using <%= console %> in views
gem 'web-console', '~> 4.2.0'
gem 'web-console', '~> 4.2.1'
# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
gem 'spring'
gem 'spring-commands-rspec', group: :development
Expand Down
Loading

0 comments on commit 03f6d9c

Please sign in to comment.