Skip to content

Commit

Permalink
reset branch specifier to master
Browse files Browse the repository at this point in the history
  • Loading branch information
alexskr committed Oct 27, 2023
1 parent 39a45f5 commit 7fcc87a
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 31 deletions.
14 changes: 7 additions & 7 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,14 @@ gem 'haml', '~> 5.2.2' # pin see https://github.com/ncbo/ontologies_api/pull/107
gem 'redcarpet'

# NCBO
gem 'goo', github: 'ncbo/goo', branch: 'develop'
gem 'ncbo_annotator', github: 'ncbo/ncbo_annotator', branch: 'develop'
gem 'ncbo_cron', github: 'ncbo/ncbo_cron', branch: 'develop'
gem 'ncbo_ontology_recommender', github: 'ncbo/ncbo_ontology_recommender', branch: 'develop'
gem 'ontologies_linked_data', github: 'ncbo/ontologies_linked_data', branch: 'develop'
gem 'sparql-client', github: 'ncbo/sparql-client', branch: 'develop'
gem 'goo', github: 'ncbo/goo', branch: 'master'
gem 'ncbo_annotator', github: 'ncbo/ncbo_annotator', branch: 'master'
gem 'ncbo_cron', github: 'ncbo/ncbo_cron', branch: 'master'
gem 'ncbo_ontology_recommender', github: 'ncbo/ncbo_ontology_recommender', branch: 'master'
gem 'ontologies_linked_data', github: 'ncbo/ontologies_linked_data', branch: 'master'
gem 'sparql-client', github: 'ncbo/sparql-client', branch: 'master'

group :development do
group :masterment do
# bcrypt_pbkdf and ed35519 is required for capistrano deployments when using ed25519 keys; see https://github.com/miloserdow/capistrano-deploy/issues/42
gem 'shotgun', github: 'palexander/shotgun', branch: 'ncbo'
gem 'rubocop'
Expand Down
48 changes: 24 additions & 24 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
GIT
remote: https://github.com/ncbo/goo.git
revision: 83425ba6c05d051d86c6f5775540727ce4238443
branch: develop
revision: daea7822af9e5ca1961d6873a758735133a1b2db
branch: master
specs:
goo (0.0.2)
addressable (~> 2.8)
Expand All @@ -15,8 +15,8 @@ GIT

GIT
remote: https://github.com/ncbo/ncbo_annotator.git
revision: 067104ae94c0e9d058cfbf419364fbf03f34de43
branch: develop
revision: 04226ac5840a328e6f906f15c769ee6ee5723102
branch: master
specs:
ncbo_annotator (0.0.1)
goo
Expand All @@ -26,8 +26,8 @@ GIT

GIT
remote: https://github.com/ncbo/ncbo_cron.git
revision: ac798aaf30ccac41860edf0df45e9caedaabbdcb
branch: develop
revision: 3fef50149aa6acda959353270174b5ee2087b377
branch: master
specs:
ncbo_cron (0.0.1)
dante
Expand All @@ -42,8 +42,8 @@ GIT

GIT
remote: https://github.com/ncbo/ncbo_ontology_recommender.git
revision: e6d4449d8b854f17bb54af6de142bc64bff22ab3
branch: develop
revision: f440ae855a217807fead1d20629a0f187997b973
branch: master
specs:
ncbo_ontology_recommender (0.0.1)
goo
Expand All @@ -53,8 +53,8 @@ GIT

GIT
remote: https://github.com/ncbo/ontologies_linked_data.git
revision: 711ebf27722355a25a0e53a8204b4ae472902bd0
branch: develop
revision: a7ad210e846a390f203457be2459719214d142fe
branch: master
specs:
ontologies_linked_data (0.0.1)
activesupport
Expand All @@ -73,8 +73,8 @@ GIT

GIT
remote: https://github.com/ncbo/sparql-client.git
revision: 55e7dbf858eb571c767bc67868f9af61663859cb
branch: develop
revision: d418d56a6c9ff5692f925b45739a2a1c66bca851
branch: master
specs:
sparql-client (1.0.1)
json_pure (>= 1.4)
Expand Down Expand Up @@ -166,10 +166,10 @@ GEM
google-cloud-env (1.6.0)
faraday (>= 0.17.3, < 3.0)
google-cloud-errors (1.3.1)
google-protobuf (3.24.3-aarch64-linux)
google-protobuf (3.24.3-arm64-darwin)
google-protobuf (3.24.3-x86_64-darwin)
google-protobuf (3.24.3-x86_64-linux)
google-protobuf (3.24.4-aarch64-linux)
google-protobuf (3.24.4-arm64-darwin)
google-protobuf (3.24.4-x86_64-darwin)
google-protobuf (3.24.4-x86_64-linux)
googleapis-common-protos (1.4.0)
google-protobuf (~> 3.14)
googleapis-common-protos-types (~> 1.2)
Expand All @@ -182,14 +182,14 @@ GEM
multi_json (~> 1.11)
os (>= 0.9, < 2.0)
signet (>= 0.16, < 2.a)
grpc (1.58.0)
google-protobuf (~> 3.23)
grpc (1.59.0)
google-protobuf (~> 3.24)
googleapis-common-protos-types (~> 1.0)
grpc (1.58.0-x86_64-darwin)
google-protobuf (~> 3.23)
grpc (1.59.0-x86_64-darwin)
google-protobuf (~> 3.24)
googleapis-common-protos-types (~> 1.0)
grpc (1.58.0-x86_64-linux)
google-protobuf (~> 3.23)
grpc (1.59.0-x86_64-linux)
google-protobuf (~> 3.24)
googleapis-common-protos-types (~> 1.0)
haml (5.2.2)
temple (>= 0.8.0)
Expand Down Expand Up @@ -218,15 +218,15 @@ GEM
method_source (1.0.0)
mime-types (3.5.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2023.0808)
mime-types-data (3.2023.1003)
mini_mime (1.1.5)
minitest (4.7.5)
minitest-stub_any_instance (1.0.3)
mlanett-redis-lock (0.2.7)
redis
multi_json (1.15.0)
net-http-persistent (2.9.4)
net-imap (0.3.7)
net-imap (0.4.2)
date
net-protocol
net-pop (0.1.2)
Expand Down

0 comments on commit 7fcc87a

Please sign in to comment.