Merge staging for release

ncbo · Apr 12, 2020 · 200c366 · 200c366
2 parents db70879 + e77d1a2
commit 200c366
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 38 deletions.
diff --git a/Gemfile b/Gemfile
@@ -18,7 +18,7 @@ gem 'rack-accept', '~> 0.4'
 gem 'rack-attack', '~> 5.4.2', require: 'rack/attack'
 gem 'rack-cache', '~> 1.0'
 gem 'rack-cors', require: 'rack/cors'
-gem 'rack-post-body-to-params', git: 'https://github.com/palexander/rack-post-body-to-params.git', branch: "multipart_support" # github dependency can be removed when https://github.com/niko/rack-post-body-to-params/pull/6 is merged and released
+gem 'rack-post-body-to-params', github: 'palexander/rack-post-body-to-params', branch: 'multipart_support' # github dependency can be removed when https://github.com/niko/rack-post-body-to-params/pull/6 is merged and released
 gem 'rack-timeout'
 gem 'redis-rack-cache', '~> 1.0'
 
@@ -28,7 +28,6 @@ gem 'redis-activesupport'
 
 # Monitoring
 gem 'cube-ruby', require: 'cube'
-gem 'newrelic_rpm'
 
 # HTTP server
 gem 'rainbows'
@@ -40,26 +39,28 @@ gem 'haml'
 gem 'redcarpet'
 
 # NCBO gems (can be from a local dev path or from rubygems/git)
-
-
-gem 'goo', git: 'https://github.com/ncbo/goo.git', branch: 'master'
-gem 'ncbo_annotator', git: 'https://github.com/ncbo/ncbo_annotator.git', branch: 'master'
-gem 'ncbo_cron', git: 'https://github.com/ncbo/ncbo_cron.git', branch: 'master'
-gem 'ncbo_ontology_recommender', git: 'https://github.com/ncbo/ncbo_ontology_recommender.git', branch: 'master'
-gem 'ontologies_linked_data', git: 'https://github.com/ncbo/ontologies_linked_data.git', branch: 'master'
-gem 'sparql-client', git: 'https://github.com/ncbo/sparql-client.git', branch: 'master'
+gem 'goo', github: 'ncbo/goo', branch: 'staging'
+gem 'sparql-client', github: 'ncbo/sparql-client', branch: 'staging'
+gem 'ontologies_linked_data', github: 'ncbo/ontologies_linked_data', branch: 'staging'
+gem 'ncbo_annotator', github: 'ncbo/ncbo_annotator', branch: 'staging'
+gem 'ncbo_cron', github: 'ncbo/ncbo_cron', branch: 'staging'
+gem 'ncbo_ontology_recommender', github: 'ncbo/ncbo_ontology_recommender', branch: 'staging'
 
 # NCBO gems (unversioned)
-gem 'ncbo_resolver', git: 'https://github.com/ncbo/ncbo_resolver.git'
-gem 'ncbo_resource_index', git: 'https://github.com/ncbo/resource_index.git'
+gem 'ncbo_resolver', github: 'ncbo/ncbo_resolver'
+gem 'ncbo_resource_index', github: 'ncbo/resource_index'
+
+group :production, :staging do
+  gem 'newrelic_rpm'
+end
 
 group :development do
   gem 'capistrano', '~> 3', require: false
   gem 'capistrano-bundler', require: false
   gem 'capistrano-locally', require: false
   gem 'capistrano-rbenv', require: false
   gem 'pry'
-  gem 'shotgun', git: 'https://github.com/palexander/shotgun.git', branch: 'ncbo'
+  gem 'shotgun', github: 'palexander/shotgun', branch: 'ncbo'
 end
 
 group :profiling do

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 GIT
   remote: https://github.com/ncbo/goo.git
-  revision: 0dba0f9626e21946d9b44065325af6b0c32b4f8e
-  branch: master
+  revision: 8e89c6be4a921484a0b15aa1304cea1bf5c0377e
+  branch: staging
   specs:
     goo (0.0.2)
       addressable (= 2.3.5)
@@ -16,8 +16,8 @@ GIT
 
 GIT
   remote: https://github.com/ncbo/ncbo_annotator.git
-  revision: 6d0c6f4cf3146abfcee9d54757121dc09dc1da3d
-  branch: master
+  revision: d17abeed8a5f1bb7edb402719ea773fd3df342f8
+  branch: staging
   specs:
     ncbo_annotator (0.0.1)
       goo
@@ -27,8 +27,8 @@ GIT
 
 GIT
   remote: https://github.com/ncbo/ncbo_cron.git
-  revision: b1b1f2f846ee2cd9b0657be9bf02b84e492a7dc9
-  branch: master
+  revision: be037d5becc6f8e055ff46076005e136adc93c79
+  branch: staging
   specs:
     ncbo_cron (0.0.1)
       dante
@@ -43,8 +43,8 @@ GIT
 
 GIT
   remote: https://github.com/ncbo/ncbo_ontology_recommender.git
-  revision: 02fc1f4de76a30ec9516e347d89452074c0efd12
-  branch: master
+  revision: 01f4381541a46cebf38c6dcdfddf9ec737f66d7c
+  branch: staging
   specs:
     ncbo_ontology_recommender (0.0.1)
       goo
@@ -62,8 +62,8 @@ GIT
 
 GIT
   remote: https://github.com/ncbo/ontologies_linked_data.git
-  revision: cfe036ffd7d6aea5e184fb0861c0e502a8e06099
-  branch: master
+  revision: 4d3ec79191c499db399b9f25ba001245da3d7fff
+  branch: staging
   specs:
     ontologies_linked_data (0.0.1)
       activesupport
@@ -96,8 +96,8 @@ GIT
 
 GIT
   remote: https://github.com/ncbo/sparql-client.git
-  revision: 39cb76898cb6c8896c43aa076e493280d9621998
-  branch: master
+  revision: 2025f80c5520b09215a9ed543ae32b71a98e261d
+  branch: staging
   specs:
     sparql-client (1.0.1)
       json_pure (>= 1.4)
@@ -129,20 +129,19 @@ GEM
     addressable (2.3.5)
     airbrussh (1.4.0)
       sshkit (>= 1.6.1, != 1.7.0)
-    backports (3.17.0)
+    backports (3.17.1)
     bcrypt (3.1.13)
     builder (3.2.4)
-    capistrano (3.12.1)
+    capistrano (3.13.0)
       airbrussh (>= 1.0.0)
       i18n
       rake (>= 10.0.0)
       sshkit (>= 1.9.0)
-    capistrano-bundler (1.1.4)
+    capistrano-bundler (1.6.0)
       capistrano (~> 3.1)
-      sshkit (~> 1.2)
     capistrano-locally (0.2.6)
       capistrano (~> 3.0)
-    capistrano-rbenv (2.0.4)
+    capistrano-rbenv (2.1.6)
       capistrano (~> 3.1)
       sshkit (~> 1.3)
     coderay (1.1.2)
@@ -164,7 +163,7 @@ GEM
       multi_json
     ethon (0.12.0)
       ffi (>= 1.3.0)
-    faraday (1.0.0)
+    faraday (1.0.1)
       multipart-post (>= 1.2, < 3)
     ffi (1.12.2)
     get_process_mem (0.2.5)
@@ -225,11 +224,11 @@ GEM
       net-ssh (>= 2.6.5, < 6.0.0)
     net-ssh (5.2.0)
     netrc (0.11.0)
-    newrelic_rpm (6.9.0.363)
+    newrelic_rpm (6.10.0.364)
     oj (2.18.5)
     omni_logger (0.1.4)
       logger
-    os (1.0.1)
+    os (1.1.0)
     parseconfig (1.0.8)
     pony (1.13.1)
       mail (>= 2.0)
@@ -241,7 +240,7 @@ GEM
       rack (>= 0.4)
     rack-attack (5.4.2)
       rack (>= 1.0, < 3)
-    rack-cache (1.11.0)
+    rack-cache (1.11.1)
       rack (>= 0.4)
     rack-cors (1.0.6)
       rack (>= 1.6.0)
@@ -289,8 +288,8 @@ GEM
     rubyzip (2.3.0)
     rufus-scheduler (2.0.24)
       tzinfo (>= 0.3.22)
-    sequel (5.30.0)
-    signet (0.13.2)
+    sequel (5.31.0)
+    signet (0.14.0)
       addressable (~> 2.3)
       faraday (>= 0.17.3, < 2.0)
       jwt (>= 1.5, < 3.0)
@@ -320,12 +319,12 @@ GEM
     tilt (2.0.10)
     typhoeus (1.3.1)
       ethon (>= 0.9.0)
-    tzinfo (2.0.1)
+    tzinfo (2.0.2)
       concurrent-ruby (~> 1.0)
     uber (0.1.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.6)
+    unf_ext (0.0.7.7)
     unicorn (5.5.4)
       kgio (~> 2.6)
       raindrops (~> 0.7)