Merge branch 'main' into jose

openjournals · Oct 10, 2023 · 3692434 · 3692434
2 parents ce6f1f3 + 1c73d7e
commit 3692434
Show file tree

Hide file tree

Showing 32 changed files with 685 additions and 295 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -11,7 +11,7 @@ jobs:
           POSTGRES_USER: postgres
           POSTGRES_PASSWORD: secret
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install Ruby
         uses: ruby/setup-ruby@v1
         with:

diff --git a/COI.md b/COI.md
@@ -1,6 +1,6 @@
 # JOSE Conflict of Interest Policy
 
-The definition of a conflict of Interest in peer review is a circumstance that makes you "unable to make an impartial scientific judgment or evaluation." ([PNAS Editorial Policies - Competing Interest](https://www.pnas.org/author-center/editorial-and-journal-policies#competing-interest)). JOSS is concerned with avoiding any actual conflicts of interest, and being sufficiently transparent that we avoid the appearance of conflicts of interest as well.
+The definition of a Conflict of Interest (COI) in peer review is a circumstance that makes you "unable to make an impartial scientific judgment or evaluation." ([PNAS Editorial Policies - Competing Interest](https://www.pnas.org/author-center/editorial-and-journal-policies#competing-interest)). JOSS is concerned with avoiding any actual conflicts of interest, and being sufficiently transparent that we avoid the appearance of conflicts of interest as well.
 
 As a reviewer, COIs are your present or previous association with any authors of a submission: recent (past four years) collaborators in funded research or work that is published; and lifetime for the family members, business partners, and thesis student/advisor or mentor. In addition, your recent (past year) association with the same organization of a submitter is a COI, for example, being employed at the same institution.
 

diff --git a/Gemfile b/Gemfile
@@ -18,7 +18,7 @@ gem 'octokit', '~> 6.0'
 gem 'pdf-reader', '~> 2.11.0'
 gem 'pg', '~> 1.4.6'
 gem 'pagy'
-gem 'rails', '7.0.7.2'
+gem 'rails', '7.1.0'
 gem "importmap-rails"
 gem "turbo-rails"
 gem "stimulus-rails"
@@ -48,9 +48,9 @@ gem "redis", "~> 5.0"
 group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console
   gem 'pry-byebug'
-  gem 'capybara', '~> 3.38'
+  gem 'capybara', '~> 3.39'
   gem 'factory_bot_rails', '~> 6.2.0'
-  gem 'rspec-rails', '~> 6.0.1'
+  gem 'rspec-rails', '~> 6.0.3'
   gem 'rails-controller-testing', '~> 1.0.5'
   gem 'selenium-webdriver'
   gem 'webmock'