Skip to content

Commit

Permalink
Merge branch 'merge-seek-1.15.1intoLDH' into test_merge
Browse files Browse the repository at this point in the history
  • Loading branch information
ReneHaensel committed Jul 10, 2024
2 parents 8e58a7e + 7208cc5 commit 75a6916
Show file tree
Hide file tree
Showing 579 changed files with 14,696 additions and 3,763 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ansible-install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Configure ansible for local install
working-directory: /home/runner/work/seek/seek/script/ansible/
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,9 @@ jobs:
sudo apt install -y graphicsmagick graphviz libcurl4-gnutls-dev libreoffice poppler-utils build-essential \
git imagemagick libgmp-dev python3.9-dev python3.9-distutils python3-pip
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Setup Java
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '11' # The JDK version to make available on the path.
Expand All @@ -77,7 +77,7 @@ jobs:
with:
bundler-cache: true # runs 'bundle install' and caches installed gems automatically
- name: Cache pip
uses: actions/cache@v3
uses: actions/cache@v4
with:
# This path is specific to Ubuntu
path: ~/.cache/pip
Expand Down
14 changes: 14 additions & 0 deletions .gitvote.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# https://github.com/cncf/gitvote/
profiles:
default:
duration: 4w
pass_threshold: 50
allowed_voters:
teams: []
users:
- beanformer
- fmeineke
- MasoudAbedi
- ReneHaensel
periodic_status_check: null
close_on_passing: false
12 changes: 6 additions & 6 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ gem 'hpricot', '~>0.8.2'
gem 'libxml-ruby', '~>2.9.0', require: 'libxml'
gem 'uuid', '~>2.3'
gem 'RedCloth', '>=4.3.0'
gem 'simple-spreadsheet-extractor', '~> 0.18.0'
gem 'simple-spreadsheet-extractor', '0.18.1'
gem 'open4'
gem 'sample-template-generator', '~>0.7'
gem 'rmagick', '5.3.0'
Expand Down Expand Up @@ -54,14 +54,14 @@ gem 'will_paginate', '~> 3.1'
gem 'yaml_db'
gem 'rails_autolink'
gem 'rfc-822'
gem 'nokogiri', '~> 1.14.3'
gem 'nokogiri', '~> 1.16'
#necessary for newer hashie dependency, original api_smith is no longer active
gem 'api_smith', git: 'https://github.com/youroute/api_smith.git', ref: '1fb428cebc17b9afab25ac9f809bde87b0ec315b'
gem 'rdf-virtuoso', '>= 0.2.0'
gem 'terrapin'
gem 'lograge'
gem 'psych'
gem 'stringio', '3.0.1' #locked to the default version for ruby 3.1
gem 'stringio', '3.0.1.1' #locked to the default version for ruby 3.1
gem 'validate_url'
gem "attr_encrypted", "~> 3.0.0"
gem 'libreconv'
Expand Down Expand Up @@ -136,7 +136,7 @@ gem 'request_store'

gem 'bundler', '>= 1.8.4'

gem 'ro-crate', '~> 0.5.1'
gem 'ro-crate', '~> 0.5.2'

gem 'rugged'
gem 'i18n-js'
Expand All @@ -163,6 +163,8 @@ gem 'net-ftp'

gem 'licensee'

gem "sitemap_generator", "~> 6.3"

group :production do
gem 'passenger'
end
Expand Down Expand Up @@ -207,5 +209,3 @@ group :test, :development do
gem 'teaspoon'
gem 'teaspoon-mocha'
end

gem "sitemap_generator", "~> 6.3"
Loading

0 comments on commit 75a6916

Please sign in to comment.