Skip to content

Commit

Permalink
Merge branch 'master' into development
Browse files Browse the repository at this point in the history
  • Loading branch information
syphax-bouazzouni committed Jan 30, 2024
2 parents 422cbb5 + 165723b commit b687f69
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 15 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ COPY Gemfile* /srv/ontoportal/ontologies_api/

WORKDIR /srv/ontoportal/ontologies_api

RUN gem update --system
RUN gem update --system 3.4.22 # the 3.4.22 can be removed if we support Ruby version > 3.0
RUN gem install bundler
ENV BUNDLE_PATH=/srv/ontoportal/bundle
RUN bundle install
Expand Down
31 changes: 17 additions & 14 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ GIT

GIT
remote: https://github.com/ontoportal-lirmm/goo.git
revision: 5979402d5138850fb9bdb34edfa350e9af1b5d22
branch: development
revision: 03da25b671d2ffa515b5dce51c6bd35980ae60c7
branch: master
specs:
goo (0.0.2)
addressable (~> 2.8)
Expand All @@ -37,7 +37,7 @@ GIT

GIT
remote: https://github.com/ontoportal-lirmm/ncbo_cron.git
revision: 8db3481116c57d2a21dc8f32bcd1695d95442280
revision: 155db7a33794f03858893d2367cb119f27726a31
branch: master
specs:
ncbo_cron (0.0.1)
Expand All @@ -53,8 +53,8 @@ GIT

GIT
remote: https://github.com/ontoportal-lirmm/ontologies_linked_data.git
revision: d5af89ba5563cbd9bfc06c51a8330015dd737614
branch: development
revision: e98b884999e5ce917a8be5fdc37f7b4797a1559e
branch: master
specs:
ontologies_linked_data (0.0.1)
activesupport
Expand Down Expand Up @@ -103,7 +103,7 @@ GEM
activesupport (3.2.22.5)
i18n (~> 0.6, >= 0.6.4)
multi_json (~> 1.0)
addressable (2.8.5)
addressable (2.8.6)
public_suffix (>= 2.0.2, < 6.0)
airbrussh (1.5.0)
sshkit (>= 1.6.1, != 1.7.0)
Expand Down Expand Up @@ -173,16 +173,19 @@ GEM
retriable (>= 2.0, < 4.a)
rexml
webrick
googleauth (1.8.1)
faraday (>= 0.17.3, < 3.a)
google-cloud-env (2.1.0)
faraday (>= 1.0, < 3.a)
googleauth (1.9.1)
faraday (>= 1.0, < 3.a)
google-cloud-env (~> 2.1)
jwt (>= 1.4, < 3.0)
multi_json (~> 1.11)
os (>= 0.9, < 2.0)
signet (>= 0.16, < 2.a)
haml (5.2.2)
temple (>= 0.8.0)
tilt
hashdiff (1.0.1)
hashdiff (1.1.0)
http-accept (1.7.0)
http-cookie (1.0.5)
domain_name (~> 0.5)
Expand All @@ -207,7 +210,7 @@ GEM
method_source (1.0.0)
mime-types (3.5.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2023.1003)
mime-types-data (3.2023.1205)
mini_mime (1.1.5)
minitest (4.7.5)
minitest-stub_any_instance (1.0.3)
Expand All @@ -216,7 +219,7 @@ GEM
multi_json (1.15.0)
multipart-post (2.3.0)
net-http-persistent (2.9.4)
net-imap (0.4.9)
net-imap (0.4.8)
date
net-protocol
net-pop (0.1.2)
Expand All @@ -227,7 +230,7 @@ GEM
net-ssh (>= 2.6.5, < 8.0.0)
net-smtp (0.4.0)
net-protocol
net-ssh (7.2.0)
net-ssh (7.2.1)
netrc (0.11.0)
newrelic_rpm (9.6.0)
base64
Expand All @@ -251,7 +254,7 @@ GEM
rack (>= 0.4)
rack-cors (1.0.6)
rack (>= 1.6.0)
rack-mini-profiler (3.1.1)
rack-mini-profiler (3.3.0)
rack (>= 1.2.0)
rack-protection (1.5.5)
rack
Expand Down Expand Up @@ -403,4 +406,4 @@ DEPENDENCIES
webmock

BUNDLED WITH
2.4.21
2.3.23
1 change: 1 addition & 0 deletions views/documentation/documentation.haml
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@
%li include={prefLabel, synonym, definition, notation, cui, semanticType} // default = (see Common Parameters section)
%li page={integer representing the page number} // default = 1
%li pagesize={integer representing the size of the returned page} // default = 50
%li language={an ISO 639-1 language value, e.g 'fr' or 'en'} // by default search in all languages
%h4#nav_search_subtree Subtree Search
Expand Down

0 comments on commit b687f69

Please sign in to comment.