Skip to content

Commit 744504f

Browse files
authored
Merge pull request #4 from ElixirTeSS/master
Merge main developments into oai-pmh branch
2 parents 8c45669 + 10efb8b commit 744504f

56 files changed

Lines changed: 1782 additions & 2181 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/codeql-analysis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242

4343
# Initializes the CodeQL tools for scanning.
4444
- name: Initialize CodeQL
45-
uses: github/codeql-action/init@v2
45+
uses: github/codeql-action/init@v3
4646
with:
4747
languages: ${{ matrix.language }}
4848
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -53,7 +53,7 @@ jobs:
5353
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
5454
# If this step fails, then you should remove it and run the build manually (see below)
5555
- name: Autobuild
56-
uses: github/codeql-action/autobuild@v2
56+
uses: github/codeql-action/autobuild@v3
5757

5858
# ℹ️ Command-line programs to run using the OS shell.
5959
# 📚 https://git.io/JvXDl
@@ -67,4 +67,4 @@ jobs:
6767
# make release
6868

6969
- name: Perform CodeQL Analysis
70-
uses: github/codeql-action/analyze@v2
70+
uses: github/codeql-action/analyze@v3

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
source 'https://rubygems.org'
44

5-
gem 'rails', '7.2.2.1'
5+
gem 'rails', '7.2.2.2'
66

77
gem 'active_model_serializers'
88
gem 'activerecord-session_store'

Gemfile.lock

Lines changed: 76 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
GIT
22
remote: https://github.com/ElixirTeSS/TeSS_RDF_Extractors
3-
revision: c89fcad2a46ead316af14b270d26c6ba924646b6
3+
revision: f9eee4621738c8fcaa9e0729e76a307fcd55650f
44
branch: master
55
specs:
66
tess_rdf_extractors (1.1.0)
@@ -23,29 +23,29 @@ GEM
2323
GEM
2424
remote: https://rubygems.org/
2525
specs:
26-
actioncable (7.2.2.1)
27-
actionpack (= 7.2.2.1)
28-
activesupport (= 7.2.2.1)
26+
actioncable (7.2.2.2)
27+
actionpack (= 7.2.2.2)
28+
activesupport (= 7.2.2.2)
2929
nio4r (~> 2.0)
3030
websocket-driver (>= 0.6.1)
3131
zeitwerk (~> 2.6)
32-
actionmailbox (7.2.2.1)
33-
actionpack (= 7.2.2.1)
34-
activejob (= 7.2.2.1)
35-
activerecord (= 7.2.2.1)
36-
activestorage (= 7.2.2.1)
37-
activesupport (= 7.2.2.1)
32+
actionmailbox (7.2.2.2)
33+
actionpack (= 7.2.2.2)
34+
activejob (= 7.2.2.2)
35+
activerecord (= 7.2.2.2)
36+
activestorage (= 7.2.2.2)
37+
activesupport (= 7.2.2.2)
3838
mail (>= 2.8.0)
39-
actionmailer (7.2.2.1)
40-
actionpack (= 7.2.2.1)
41-
actionview (= 7.2.2.1)
42-
activejob (= 7.2.2.1)
43-
activesupport (= 7.2.2.1)
39+
actionmailer (7.2.2.2)
40+
actionpack (= 7.2.2.2)
41+
actionview (= 7.2.2.2)
42+
activejob (= 7.2.2.2)
43+
activesupport (= 7.2.2.2)
4444
mail (>= 2.8.0)
4545
rails-dom-testing (~> 2.2)
46-
actionpack (7.2.2.1)
47-
actionview (= 7.2.2.1)
48-
activesupport (= 7.2.2.1)
46+
actionpack (7.2.2.2)
47+
actionview (= 7.2.2.2)
48+
activesupport (= 7.2.2.2)
4949
nokogiri (>= 1.8.5)
5050
racc
5151
rack (>= 2.2.4, < 3.2)
@@ -54,15 +54,15 @@ GEM
5454
rails-dom-testing (~> 2.2)
5555
rails-html-sanitizer (~> 1.6)
5656
useragent (~> 0.16)
57-
actiontext (7.2.2.1)
58-
actionpack (= 7.2.2.1)
59-
activerecord (= 7.2.2.1)
60-
activestorage (= 7.2.2.1)
61-
activesupport (= 7.2.2.1)
57+
actiontext (7.2.2.2)
58+
actionpack (= 7.2.2.2)
59+
activerecord (= 7.2.2.2)
60+
activestorage (= 7.2.2.2)
61+
activesupport (= 7.2.2.2)
6262
globalid (>= 0.6.0)
6363
nokogiri (>= 1.8.5)
64-
actionview (7.2.2.1)
65-
activesupport (= 7.2.2.1)
64+
actionview (7.2.2.2)
65+
activesupport (= 7.2.2.2)
6666
builder (~> 3.1)
6767
erubi (~> 1.11)
6868
rails-dom-testing (~> 2.2)
@@ -72,32 +72,32 @@ GEM
7272
activemodel (>= 4.1)
7373
case_transform (>= 0.2)
7474
jsonapi-renderer (>= 0.1.1.beta1, < 0.3)
75-
activejob (7.2.2.1)
76-
activesupport (= 7.2.2.1)
75+
activejob (7.2.2.2)
76+
activesupport (= 7.2.2.2)
7777
globalid (>= 0.3.6)
78-
activemodel (7.2.2.1)
79-
activesupport (= 7.2.2.1)
78+
activemodel (7.2.2.2)
79+
activesupport (= 7.2.2.2)
8080
activemodel-serializers-xml (1.0.3)
8181
activemodel (>= 5.0.0.a)
8282
activesupport (>= 5.0.0.a)
8383
builder (~> 3.1)
84-
activerecord (7.2.2.1)
85-
activemodel (= 7.2.2.1)
86-
activesupport (= 7.2.2.1)
84+
activerecord (7.2.2.2)
85+
activemodel (= 7.2.2.2)
86+
activesupport (= 7.2.2.2)
8787
timeout (>= 0.4.0)
8888
activerecord-session_store (2.0.0)
8989
actionpack (>= 5.2.4.1)
9090
activerecord (>= 5.2.4.1)
9191
multi_json (~> 1.11, >= 1.11.2)
9292
rack (>= 2.0.8, < 3)
9393
railties (>= 5.2.4.1)
94-
activestorage (7.2.2.1)
95-
actionpack (= 7.2.2.1)
96-
activejob (= 7.2.2.1)
97-
activerecord (= 7.2.2.1)
98-
activesupport (= 7.2.2.1)
94+
activestorage (7.2.2.2)
95+
actionpack (= 7.2.2.2)
96+
activejob (= 7.2.2.2)
97+
activerecord (= 7.2.2.2)
98+
activesupport (= 7.2.2.2)
9999
marcel (~> 1.0)
100-
activesupport (7.2.2.1)
100+
activesupport (7.2.2.2)
101101
base64
102102
benchmark (>= 0.3)
103103
bigdecimal
@@ -131,7 +131,7 @@ GEM
131131
erubi (>= 1.0.0)
132132
rack (>= 0.9.0)
133133
rouge (>= 1.0.0)
134-
bigdecimal (3.2.2)
134+
bigdecimal (3.2.3)
135135
bindata (2.5.0)
136136
bindex (0.8.1)
137137
binding_of_caller (1.0.0)
@@ -159,7 +159,7 @@ GEM
159159
openapi_parser (~> 1.0)
160160
rack (>= 1.5)
161161
concurrent-ruby (1.3.5)
162-
connection_pool (2.5.3)
162+
connection_pool (2.5.4)
163163
countries (5.6.0)
164164
unaccent (~> 0.3)
165165
country_select (8.0.2)
@@ -243,7 +243,7 @@ GEM
243243
icalendar (2.9.0)
244244
ice_cube (~> 0.16)
245245
ice_cube (0.16.4)
246-
io-console (0.8.0)
246+
io-console (0.8.1)
247247
irb (1.15.2)
248248
pp (>= 0.6.0)
249249
rdoc (>= 4.0.0)
@@ -279,7 +279,7 @@ GEM
279279
rack (>= 2.2, < 4)
280280
rdf (~> 3.3)
281281
rexml (~> 3.2)
282-
json-ld-preloaded (3.3.1)
282+
json-ld-preloaded (3.3.2)
283283
json-ld (~> 3.3)
284284
rdf (~> 3.3)
285285
json_schema (0.21.0)
@@ -351,7 +351,7 @@ GEM
351351
net-pop
352352
net-smtp
353353
marcel (1.0.4)
354-
matrix (0.4.2)
354+
matrix (0.4.3)
355355
maxmind-db (1.2.0)
356356
method_source (1.1.0)
357357
mime-types (3.5.1)
@@ -375,14 +375,14 @@ GEM
375375
money (~> 6.13)
376376
railties (>= 3.0)
377377
msgpack (1.7.2)
378-
multi_json (1.15.0)
378+
multi_json (1.17.0)
379379
multi_xml (0.6.0)
380380
multipart-post (2.4.1)
381381
nested_form (0.3.2)
382382
net-http (0.6.0)
383383
uri
384-
net-http-persistent (4.0.5)
385-
connection_pool (~> 2.2)
384+
net-http-persistent (4.0.6)
385+
connection_pool (~> 2.2, >= 2.2.4)
386386
net-imap (0.5.8)
387387
date
388388
net-protocol
@@ -428,6 +428,7 @@ GEM
428428
validate_url
429429
webfinger (~> 2.0)
430430
orm_adapter (0.5.0)
431+
ostruct (0.6.3)
431432
parallel (1.23.0)
432433
parser (3.2.2.3)
433434
ast (~> 2.4.1)
@@ -452,7 +453,7 @@ GEM
452453
activerecord (>= 6.1)
453454
i18n (>= 0.5.0)
454455
railties (>= 6.1.0)
455-
public_suffix (6.0.1)
456+
public_suffix (6.0.2)
456457
puma (6.5.0)
457458
nio4r (~> 2.0)
458459
pundit (2.3.1)
@@ -477,20 +478,20 @@ GEM
477478
rackup (1.0.1)
478479
rack (< 3)
479480
webrick
480-
rails (7.2.2.1)
481-
actioncable (= 7.2.2.1)
482-
actionmailbox (= 7.2.2.1)
483-
actionmailer (= 7.2.2.1)
484-
actionpack (= 7.2.2.1)
485-
actiontext (= 7.2.2.1)
486-
actionview (= 7.2.2.1)
487-
activejob (= 7.2.2.1)
488-
activemodel (= 7.2.2.1)
489-
activerecord (= 7.2.2.1)
490-
activestorage (= 7.2.2.1)
491-
activesupport (= 7.2.2.1)
481+
rails (7.2.2.2)
482+
actioncable (= 7.2.2.2)
483+
actionmailbox (= 7.2.2.2)
484+
actionmailer (= 7.2.2.2)
485+
actionpack (= 7.2.2.2)
486+
actiontext (= 7.2.2.2)
487+
actionview (= 7.2.2.2)
488+
activejob (= 7.2.2.2)
489+
activemodel (= 7.2.2.2)
490+
activerecord (= 7.2.2.2)
491+
activestorage (= 7.2.2.2)
492+
activesupport (= 7.2.2.2)
492493
bundler (>= 1.15.0)
493-
railties (= 7.2.2.1)
494+
railties (= 7.2.2.2)
494495
rails-controller-testing (1.0.5)
495496
actionpack (>= 5.0.1.rc1)
496497
actionview (>= 5.0.1.rc1)
@@ -512,9 +513,9 @@ GEM
512513
nested_form (~> 0.3)
513514
rails (>= 6.0, < 9)
514515
turbo-rails (>= 1.0, < 3)
515-
railties (7.2.2.1)
516-
actionpack (= 7.2.2.1)
517-
activesupport (= 7.2.2.1)
516+
railties (7.2.2.2)
517+
actionpack (= 7.2.2.2)
518+
activesupport (= 7.2.2.2)
518519
irb (~> 1.13)
519520
rackup (>= 1.0.0)
520521
rake (>= 12.2)
@@ -525,10 +526,13 @@ GEM
525526
rb-fsevent (0.11.2)
526527
rb-inotify (0.10.1)
527528
ffi (~> 1.0)
528-
rdf (3.3.2)
529+
rdf (3.3.4)
529530
bcp47_spec (~> 0.2)
530531
bigdecimal (~> 3.1, >= 3.1.5)
531532
link_header (~> 0.0, >= 0.0.8)
533+
logger (~> 1.5)
534+
ostruct (~> 0.6)
535+
readline (~> 0.0)
532536
rdf-aggregate-repo (3.3.0)
533537
rdf (~> 3.3)
534538
rdf-hamster-repo (3.3.0)
@@ -585,22 +589,24 @@ GEM
585589
rdf-turtle (3.3.0)
586590
ebnf (~> 2.4)
587591
rdf (~> 3.3)
588-
rdf-vocab (3.3.2)
592+
rdf-vocab (3.3.3)
589593
rdf (~> 3.3)
590594
rdf-xsd (3.3.0)
591595
rdf (~> 3.3)
592596
rexml (~> 3.2)
593597
rdoc (6.14.0)
594598
erb
595599
psych (>= 4.0.0)
600+
readline (0.0.4)
601+
reline
596602
recaptcha (5.15.0)
597603
redcarpet (3.6.0)
598604
redis (5.0.7)
599605
redis-client (>= 0.9.0)
600606
redis-client (0.16.0)
601607
connection_pool
602608
regexp_parser (2.8.1)
603-
reline (0.6.1)
609+
reline (0.6.2)
604610
io-console (~> 0.5)
605611
responders (3.1.1)
606612
actionpack (>= 5.2)
@@ -612,7 +618,7 @@ GEM
612618
netrc (~> 0.8)
613619
reverse_markdown (2.1.1)
614620
nokogiri
615-
rexml (3.4.0)
621+
rexml (3.4.2)
616622
rouge (4.1.3)
617623
rsolr (2.6.0)
618624
builder (>= 2.1.2)
@@ -746,13 +752,13 @@ GEM
746752
sxp (1.3.0)
747753
matrix (~> 0.4)
748754
rdf (~> 3.3)
749-
temple (0.10.3)
755+
temple (0.10.4)
750756
terrapin (0.6.0)
751757
climate_control (>= 0.0.3, < 1.0)
752758
terser (1.1.17)
753759
execjs (>= 0.3.0, < 3)
754760
thor (1.4.0)
755-
tilt (2.6.0)
761+
tilt (2.6.1)
756762
timeout (0.4.3)
757763
turbo-rails (2.0.11)
758764
actionpack (>= 6.0.0)
@@ -863,7 +869,7 @@ DEPENDENCIES
863869
puma
864870
pundit
865871
rack-cors
866-
rails (= 7.2.2.1)
872+
rails (= 7.2.2.2)
867873
rails-assets-clipboard (~> 1.5.12)!
868874
rails-assets-devbridge-autocomplete (~> 1.4.9)!
869875
rails-assets-eonasdan-bootstrap-datetimepicker (~> 4.17.42)!

app/controllers/workflows_controller.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ def index
2424
# GET /workflows/1.json
2525
def show
2626
authorize @workflow
27-
@skip_flash_messages_in_header = true # we will handle flash messages in the 'workflows' layout
2827
respond_to do |format|
2928
format.html { render layout: 'workflows' }
3029
format.json

0 commit comments

Comments
 (0)