diff options
| author | Valery Sizov <valery@gitlab.com> | 2015-06-09 10:23:38 +0000 |
|---|---|---|
| committer | Valery Sizov <valery@gitlab.com> | 2015-06-09 10:23:38 +0000 |
| commit | fe0504a1b3d25ce1e993762beecb75798e23cf7e (patch) | |
| tree | a0f43b1f1e6ca2f252ee805bc4504c585e97afdd | |
| parent | d1f7487b0a10721fecc545d3f3e8a353a74bcd77 (diff) | |
| parent | de27c2f5724e57cbe18e696e43625005b3a820df (diff) | |
| download | gitlab-ci-fe0504a1b3d25ce1e993762beecb75798e23cf7e.tar.gz | |
Merge branch 'master' into 'master'
update fog to 1.25.0 to support aws v4
See merge request !129
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 6 |
2 files changed, 4 insertions, 4 deletions
@@ -89,7 +89,7 @@ gem "paranoia", "~> 2.0" gem "colored" # for aws storage -gem "fog", "~> 1.14" +gem "fog", "~> 1.25.0" gem "unf" diff --git a/Gemfile.lock b/Gemfile.lock index f6908a0..6315984 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -118,15 +118,15 @@ GEM fastercsv (1.5.5) ffaker (1.22.1) ffi (1.9.3) - fog (1.21.0) + fog (1.25.0) fog-brightbox - fog-core (~> 1.21, >= 1.21.1) + fog-core (>= 1.25.0) fog-json nokogiri (~> 1.5, >= 1.5.11) fog-brightbox (0.0.1) fog-core fog-json - fog-core (1.21.1) + fog-core (1.25.0) builder excon (~> 0.32) formatador (~> 0.2.0) |