diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2017-08-03 17:41:09 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-03 17:41:09 -0400 |
| commit | 762c7da7832c5641e19e6eb44b0b443ab67b1400 (patch) | |
| tree | b2e34cb3604a7098ead50b4a76f2d836d7630044 | |
| parent | b76f4e47e842d4f6e4519046461e1a3da99ccf82 (diff) | |
| parent | 053e556df1a45705f9bbd236551a465a391fc12e (diff) | |
| download | rails-762c7da7832c5641e19e6eb44b0b443ab67b1400.tar.gz rails-762c7da7832c5641e19e6eb44b0b443ab67b1400.tar.bz2 rails-762c7da7832c5641e19e6eb44b0b443ab67b1400.zip | |
Merge pull request #30041 from dixpac/change_azure_core_dependecy
Change azure core dependency
| -rw-r--r-- | Gemfile | 3 | ||||
| -rw-r--r-- | Gemfile.lock | 14 |
2 files changed, 4 insertions, 13 deletions
@@ -95,9 +95,6 @@ end group :storage do gem "aws-sdk", "~> 2", require: false gem "google-cloud-storage", "~> 1.3", require: false - - # Contains fix to be able to test using StringIO - gem "azure-core", git: "https://github.com/dixpac/azure-ruby-asm-core.git" gem "azure-storage", require: false gem "mini_magick" diff --git a/Gemfile.lock b/Gemfile.lock index 541c31bfaa..0738e1c35d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -7,15 +7,6 @@ GIT pg (>= 0.17, < 0.20) GIT - remote: https://github.com/dixpac/azure-ruby-asm-core.git - revision: 4403389747f44a94b73e7a7522d1ea11f8b1a266 - specs: - azure-core (0.1.8) - faraday (~> 0.9) - faraday_middleware (~> 0.10) - nokogiri (~> 1.7) - -GIT remote: https://github.com/erikhuda/thor.git revision: df5ba2b653a28087b3617d6c082b00866b0c0d6c specs: @@ -134,6 +125,10 @@ GEM aws-sdk-resources (2.10.19) aws-sdk-core (= 2.10.19) aws-sigv4 (1.0.1) + azure-core (0.1.9) + faraday (~> 0.9) + faraday_middleware (~> 0.10) + nokogiri (~> 1.7) azure-storage (0.11.4.preview) azure-core (~> 0.1) faraday (~> 0.9) @@ -488,7 +483,6 @@ DEPENDENCIES activerecord-jdbcsqlite3-adapter (>= 1.3.0) arel! aws-sdk (~> 2) - azure-core! azure-storage backburner bcrypt (~> 3.1.11) |