diff --git a/Gemfile b/Gemfile index 8aad5c48f..7946b51f0 100644 --- a/Gemfile +++ b/Gemfile @@ -68,7 +68,7 @@ end gem 'PriorityQueue' # Klavins lab gems -gem 'anemone', :git => 'https://github.com/klavinslab/anemone', branch: 'rails_4_2_11_1' +gem 'anemone', :git => 'https://github.com/klavinslab/anemone', tag: 'v1.0.1' gem 'aquadoc', :git => 'https://github.com/klavinslab/aquadoc' diff --git a/Gemfile.lock b/Gemfile.lock index abfca56e1..a33d91d0b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/klavinslab/anemone - revision: 31e4035ea39e6f2c4c030de84e6b77ca1c07e242 - branch: rails_4_2_11_1 + revision: a21bc5952742ac9b3c7f48fc6f15a2e84fe2e5cf + tag: v1.0.1 specs: - anemone (0.1.1) + anemone (1.0.1) rails (= 4.2.11.1) GIT @@ -67,17 +67,16 @@ GEM json (~> 1.4) nokogiri (>= 1.4.4) uuidtools (~> 2.1) - aws-sdk-core (3.47.0) + aws-sdk-core (3.48.2) aws-eventstream (~> 1.0, >= 1.0.2) aws-partitions (~> 1.0) aws-sigv4 (~> 1.1) - http-2 (~> 0.10) jmespath (~> 1.0) - aws-sdk-kms (1.14.0) - aws-sdk-core (~> 3, >= 3.47.0) + aws-sdk-kms (1.15.0) + aws-sdk-core (~> 3, >= 3.48.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.32.0) - aws-sdk-core (~> 3, >= 3.47.0) + aws-sdk-s3 (1.33.0) + aws-sdk-core (~> 3, >= 3.48.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.0) aws-sigv4 (1.1.0) @@ -102,7 +101,6 @@ GEM github-markup (3.0.3) globalid (0.4.2) activesupport (>= 4.2.0) - http-2 (0.10.1) httparty (0.16.4) mime-types (~> 3.0) multi_xml (>= 0.5.2) @@ -132,7 +130,7 @@ GEM mini_portile2 (~> 2.4.0) octokit (4.13.0) sawyer (~> 0.8.0, >= 0.5.3) - oj (3.7.10) + oj (3.7.11) paperclip (6.1.0) activemodel (>= 4.2.0) activesupport (>= 4.2.0) @@ -142,12 +140,11 @@ GEM parallel (1.14.0) parser (2.6.0.0) ast (~> 2.4.0) - powerpack (0.1.2) protected_attributes_continued (1.2.4) activemodel (>= 4.0.1, < 6.0) psych (3.1.0) public_suffix (3.0.3) - puma (3.12.0) + puma (3.12.1) rack (1.6.11) rack-cors (1.0.2) rack-test (0.6.3) @@ -198,15 +195,14 @@ GEM rspec-mocks (~> 3.8.0) rspec-support (~> 3.8.0) rspec-support (3.8.0) - rubocop (0.65.0) + rubocop (0.66.0) jaro_winkler (~> 1.5.1) parallel (~> 1.10) parser (>= 2.5, != 2.5.1.1) - powerpack (~> 0.1) psych (>= 3.1.0) rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) - unicode-display_width (~> 1.4.0) + unicode-display_width (>= 1.4.0, < 1.6) ruby-progressbar (1.10.0) sassc (2.0.1) ffi (~> 1.9) @@ -237,13 +233,13 @@ GEM thread_safe (~> 0.1) tzinfo-data (1.2018.9) tzinfo (>= 1.0.0) - unicode-display_width (1.4.1) + unicode-display_width (1.5.0) uuidtools (2.1.5) web-console (3.3.0) activemodel (>= 4.2) debug_inspector railties (>= 4.2) - will_paginate (3.1.6) + will_paginate (3.1.7) yard (0.9.16) yard-activerecord (0.0.16) yard (>= 0.8.3)