Skip to content

Commit 8ce521e

Browse files
sethboylestjvman
andcommitted
Bump fog-azure-rm
* we have to use a special branch of azure-storage-ruby for now until its merged in Co-authored-by: Seth Boyles <[email protected]> Co-authored-by: Tom Viehman <[email protected]>
1 parent 225272b commit 8ce521e

File tree

2 files changed

+24
-8
lines changed

2 files changed

+24
-8
lines changed

Gemfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,14 @@ gem 'activemodel', '~> 6.1.4'
5353
gem 'railties', '~> 6.1.4'
5454

5555
# Blobstore and Bits Service Dependencies
56-
gem 'azure-storage', '0.14.0.preview' # https://github.com/Azure/azure-storage-ruby/issues/122
5756
gem 'bits_service_client', '~> 3.3', '>= 3.3.0'
57+
58+
gem 'azure-storage-blob', git: 'https://github.com/sethboyles/azure-storage-ruby.git', branch: 'x-ms-blob-content-type-fix-1.1'
59+
5860
gem 'fog-aliyun'
5961
gem 'fog-aws'
6062
gem 'fog-azure-rm', git: 'https://github.com/fog/fog-azure-rm.git', branch: 'fog-arm-cf'
61-
gem 'fog-google'
63+
gem 'fog-google', '~> 1.18.0'
6264
gem 'fog-local'
6365
gem 'fog-openstack'
6466

Gemfile.lock

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ GIT
77

88
GIT
99
remote: https://github.com/fog/fog-azure-rm.git
10-
revision: 79a738331538c6bdba806774cb11af8977979f8e
10+
revision: 69ba1d7e9f82b7a71214b92fa6fa95169b539ed3
1111
branch: fog-arm-cf
1212
specs:
1313
fog-azure-rm (0.4.7)
@@ -25,6 +25,19 @@ GIT
2525
mime-types (~> 3.0)
2626
vhd (= 0.0.4)
2727

28+
GIT
29+
remote: https://github.com/sethboyles/azure-storage-ruby.git
30+
revision: d4737cdfcef3f3c4c2463a54690b6b73c0f6f707
31+
branch: x-ms-blob-content-type-fix-1.1
32+
specs:
33+
azure-storage-blob (1.1.0)
34+
azure-core (~> 0.1.13)
35+
azure-storage-common (~> 1.0)
36+
nokogiri (~> 1.6, >= 1.6.8)
37+
azure-storage-common (1.1.0)
38+
azure-core (~> 0.1.13)
39+
nokogiri (~> 1.6, >= 1.6.8)
40+
2841
GIT
2942
remote: https://github.com/sporkrb/spork
3043
revision: 224df492657e617a0c93c0319e78f0eefee5b636
@@ -142,8 +155,8 @@ GEM
142155
eventmachine (>= 1.0.0.beta.4)
143156
erubi (1.10.0)
144157
eventmachine (1.2.7)
145-
excon (0.90.0)
146-
faraday (0.15.4)
158+
excon (0.91.0)
159+
faraday (0.17.4)
147160
multipart-post (>= 1.2, < 3)
148161
faraday-cookie_jar (0.0.6)
149162
faraday (>= 0.7.4)
@@ -500,7 +513,8 @@ GEM
500513
crack (>= 0.3.2)
501514
hashdiff (>= 0.4.0, < 2.0.0)
502515
webrick (1.7.0)
503-
xml-simple (1.1.5)
516+
xml-simple (1.1.9)
517+
rexml
504518
yajl-ruby (1.4.1)
505519
yard (0.9.27)
506520
webrick (~> 1.7.0)
@@ -520,7 +534,7 @@ DEPENDENCIES
520534
addressable
521535
allowy (>= 2.1.0)
522536
awesome_print
523-
azure-storage (= 0.14.0.preview)
537+
azure-storage-blob!
524538
bits_service_client (~> 3.3, >= 3.3.0)
525539
byebug
526540
cf-copilot (= 0.0.14)
@@ -535,7 +549,7 @@ DEPENDENCIES
535549
fog-aliyun
536550
fog-aws
537551
fog-azure-rm!
538-
fog-google
552+
fog-google (~> 1.7.1)
539553
fog-local
540554
fog-openstack
541555
googleapis-common-protos (>= 1.3.12)

0 commit comments

Comments
 (0)