Skip to content

Commit 6c2b8ce

Browse files
committed
Merge branch 'master' into develop
2 parents 8d561cc + eb807a0 commit 6c2b8ce

2 files changed

Lines changed: 28 additions & 28 deletions

File tree

Gemfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,12 @@ gem 'haml', '~> 5.2.2' # pin see https://github.com/ncbo/ontologies_api/pull/107
4343
gem 'redcarpet'
4444

4545
# NCBO gems (can be from a local dev path or from rubygems/git)
46-
gem 'goo', github: 'ncbo/goo', branch: 'develop'
47-
gem 'ncbo_annotator', github: 'ncbo/ncbo_annotator', branch: 'develop'
48-
gem 'ncbo_cron', github: 'ncbo/ncbo_cron', branch: 'develop'
49-
gem 'ncbo_ontology_recommender', github: 'ncbo/ncbo_ontology_recommender', branch: 'develop'
50-
gem 'ontologies_linked_data', github: 'ncbo/ontologies_linked_data', branch: 'develop'
51-
gem 'sparql-client', github: 'ncbo/sparql-client', branch: 'develop'
46+
gem 'goo', github: 'ncbo/goo', branch: 'master'
47+
gem 'ncbo_annotator', github: 'ncbo/ncbo_annotator', branch: 'master'
48+
gem 'ncbo_cron', github: 'ncbo/ncbo_cron', branch: 'master'
49+
gem 'ncbo_ontology_recommender', github: 'ncbo/ncbo_ontology_recommender', branch: 'master'
50+
gem 'ontologies_linked_data', github: 'ncbo/ontologies_linked_data', branch: 'master'
51+
gem 'sparql-client', github: 'ncbo/sparql-client', branch: 'master'
5252

5353
group :development do
5454
# bcrypt_pbkdf and ed35519 is required for capistrano deployments when using ed25519 keys; see https://github.com/miloserdow/capistrano-deploy/issues/42

Gemfile.lock

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
GIT
22
remote: https://github.com/ncbo/goo.git
3-
revision: c3f9a7f789bf2f52ed31f0272d2725117d3ac04e
4-
branch: develop
3+
revision: b9019ad9e1eb78c74105fc6c6a879085066da17d
4+
branch: master
55
specs:
66
goo (0.0.2)
77
addressable (~> 2.8)
@@ -16,8 +16,8 @@ GIT
1616

1717
GIT
1818
remote: https://github.com/ncbo/ncbo_annotator.git
19-
revision: 6671099a39fffa8b98f21db7593cef35dd296b65
20-
branch: develop
19+
revision: 4fb9114b80b99f0a654c7f70aaa96839c74fc615
20+
branch: master
2121
specs:
2222
ncbo_annotator (0.0.1)
2323
goo
@@ -27,8 +27,8 @@ GIT
2727

2828
GIT
2929
remote: https://github.com/ncbo/ncbo_cron.git
30-
revision: edabffd3c0199b7c56c376b46bd4d15ec2077f69
31-
branch: develop
30+
revision: e20cc68d2c4e5ab1c6087679b3537a5fa7c7c04e
31+
branch: master
3232
specs:
3333
ncbo_cron (0.0.1)
3434
dante
@@ -45,8 +45,8 @@ GIT
4545

4646
GIT
4747
remote: https://github.com/ncbo/ncbo_ontology_recommender.git
48-
revision: c508796d80764bf748b51e9f1c33e57ea9f14a1d
49-
branch: develop
48+
revision: c6a18eb7700b23a1a4f1e32ebc94003bf75efe93
49+
branch: master
5050
specs:
5151
ncbo_ontology_recommender (0.0.1)
5252
goo
@@ -56,8 +56,8 @@ GIT
5656

5757
GIT
5858
remote: https://github.com/ncbo/ontologies_linked_data.git
59-
revision: 67169f3264aaa73c6619a599907a3c724535a69f
60-
branch: develop
59+
revision: 93e0844e19c3632bbd613a3e33869e267a6f2e25
60+
branch: master
6161
specs:
6262
ontologies_linked_data (0.0.1)
6363
activesupport
@@ -77,8 +77,8 @@ GIT
7777

7878
GIT
7979
remote: https://github.com/ncbo/sparql-client.git
80-
revision: 1657f0dd69fd4b522d3549a6848670175f5e98cc
81-
branch: develop
80+
revision: e89c26aa96f184dbe9b52d51e04fb3d9ba998dbc
81+
branch: master
8282
specs:
8383
sparql-client (1.0.1)
8484
json_pure (>= 1.4)
@@ -157,7 +157,7 @@ GEM
157157
ffi (1.17.2-aarch64-linux-gnu)
158158
ffi (1.17.2-arm64-darwin)
159159
ffi (1.17.2-x86_64-linux-gnu)
160-
gapic-common (0.25.0)
160+
gapic-common (0.26.0)
161161
faraday (>= 1.9, < 3.a)
162162
faraday-retry (>= 1.0, < 3.a)
163163
google-cloud-env (~> 2.2)
@@ -169,28 +169,28 @@ GEM
169169
grpc (~> 1.66)
170170
get_process_mem (0.2.7)
171171
ffi (~> 1.0)
172-
google-analytics-data (0.7.0)
172+
google-analytics-data (0.7.1)
173173
google-analytics-data-v1beta (>= 0.11, < 2.a)
174174
google-cloud-core (~> 1.6)
175-
google-analytics-data-v1beta (0.16.0)
175+
google-analytics-data-v1beta (0.16.1)
176176
gapic-common (>= 0.25.0, < 2.a)
177177
google-cloud-errors (~> 1.0)
178178
google-cloud-core (1.8.0)
179179
google-cloud-env (>= 1.0, < 3.a)
180180
google-cloud-errors (~> 1.0)
181-
google-cloud-env (2.2.2)
181+
google-cloud-env (2.3.0)
182182
base64 (~> 0.2)
183183
faraday (>= 1.0, < 3.a)
184184
google-cloud-errors (1.5.0)
185-
google-logging-utils (0.1.0)
185+
google-logging-utils (0.2.0)
186186
google-protobuf (3.25.7-aarch64-linux)
187187
google-protobuf (3.25.7-arm64-darwin)
188188
google-protobuf (3.25.7-x86_64-linux)
189-
googleapis-common-protos (1.7.0)
189+
googleapis-common-protos (1.8.0)
190190
google-protobuf (>= 3.18, < 5.a)
191-
googleapis-common-protos-types (~> 1.7)
191+
googleapis-common-protos-types (~> 1.20)
192192
grpc (~> 1.41)
193-
googleapis-common-protos-types (1.19.0)
193+
googleapis-common-protos-types (1.20.0)
194194
google-protobuf (>= 3.18, < 5.a)
195195
googleauth (1.14.0)
196196
faraday (>= 1.0, < 3.a)
@@ -240,7 +240,7 @@ GEM
240240
mime-types (3.7.0)
241241
logger
242242
mime-types-data (~> 3.2025, >= 3.2025.0507)
243-
mime-types-data (3.2025.0624)
243+
mime-types-data (3.2025.0701)
244244
mini_mime (1.1.5)
245245
minitest (5.25.5)
246246
minitest-hooks (1.5.2)
@@ -353,7 +353,7 @@ GEM
353353
rubyzip (2.4.1)
354354
rufus-scheduler (2.0.24)
355355
tzinfo (>= 0.3.22)
356-
signet (0.19.0)
356+
signet (0.20.0)
357357
addressable (~> 2.8)
358358
faraday (>= 0.17.5, < 3.a)
359359
jwt (>= 1.5, < 3.0)

0 commit comments

Comments
 (0)