Skip to content

Commit

Permalink
Merge staging for release
Browse files Browse the repository at this point in the history
  • Loading branch information
mdorf committed Jul 21, 2020
2 parents dd8e7a5 + 342aeac commit 78bebe9
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ gem 'rack-timeout'
gem 'redis-rack-cache', '~> 1.0'

# Data access (caching)
gem 'redis', '~> 3.3.3'
gem 'redis'
gem 'redis-activesupport'

# Monitoring
Expand Down
22 changes: 11 additions & 11 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ GIT

GIT
remote: https://github.com/ncbo/ncbo_annotator.git
revision: 2f7ab9ecdab248a09d33533c8a423b41aa0630a0
branch: master
revision: ae5a489156521f9b17d0c6165cbb677aa885b915
branch: staging
specs:
ncbo_annotator (0.0.1)
goo
Expand All @@ -27,8 +27,8 @@ GIT

GIT
remote: https://github.com/ncbo/ncbo_cron.git
revision: 2ea49493d3175263cfb0be3f83f9c95b4b47607c
branch: master
revision: 1fa907cc930f66d339c7a5293e1900360e5611a1
branch: staging
specs:
ncbo_cron (0.0.1)
dante
Expand All @@ -43,8 +43,8 @@ GIT

GIT
remote: https://github.com/ncbo/ncbo_ontology_recommender.git
revision: 4f889df54871eca5a4bdd479138733a2998c4440
branch: master
revision: a7a576ad7170f933c87c7f95e214a95d785b6739
branch: staging
specs:
ncbo_ontology_recommender (0.0.1)
goo
Expand All @@ -62,8 +62,8 @@ GIT

GIT
remote: https://github.com/ncbo/ontologies_linked_data.git
revision: 73e29d31846723056ab52d290b36fb9e0da8b3bc
branch: master
revision: 9181b5a9d2d91fb6e5605074d65ecbc82664e3fd
branch: staging
specs:
ontologies_linked_data (0.0.1)
activesupport
Expand Down Expand Up @@ -225,7 +225,7 @@ GEM
net-ssh (>= 2.6.5, < 7.0.0)
net-ssh (6.1.0)
netrc (0.11.0)
newrelic_rpm (6.11.0.365)
newrelic_rpm (6.12.0.367)
oj (2.18.5)
omni_logger (0.1.4)
logger
Expand Down Expand Up @@ -262,7 +262,7 @@ GEM
addressable (>= 2.2)
recursive-open-struct (1.1.2)
redcarpet (3.5.0)
redis (3.3.5)
redis (4.2.1)
redis-activesupport (4.1.5)
activesupport (>= 3, < 5)
redis-store (~> 1.1.0)
Expand Down Expand Up @@ -377,7 +377,7 @@ DEPENDENCIES
rainbows
rake (~> 10.0)
redcarpet
redis (~> 3.3.3)
redis
redis-activesupport
redis-rack-cache (~> 1.0)
shotgun!
Expand Down

0 comments on commit 78bebe9

Please sign in to comment.