diff options
| author | Valery Sizov <valery@gitlab.com> | 2015-06-03 09:15:34 +0000 |
|---|---|---|
| committer | Valery Sizov <valery@gitlab.com> | 2015-06-03 09:15:34 +0000 |
| commit | c972e0f9415d237911f74d986f3b5485c89494e9 (patch) | |
| tree | e1e9743cc5d30a447286854fcd8d77e20ee19b01 | |
| parent | 2e2f8f61549faebdde2021b2c82c2f3d623fc513 (diff) | |
| parent | 7ec56fff5c1fefb0251a68b1aa639e65f6cb5bcc (diff) | |
| download | gitlab-ci-c972e0f9415d237911f74d986f3b5485c89494e9.tar.gz | |
Merge branch 'aws_support' into 'master'
AWS support
https://dev.gitlab.org/gitlab/gitlab-ci/issues/248
See merge request !111
| -rw-r--r-- | Gemfile | 4 | ||||
| -rw-r--r-- | Gemfile.lock | 26 |
2 files changed, 30 insertions, 0 deletions
@@ -88,6 +88,10 @@ gem "paranoia", "~> 2.0" # Colored output to console gem "colored" +# for aws storage +gem "fog", "~> 1.14" +gem "unf" + group :development do gem 'brakeman', require: false diff --git a/Gemfile.lock b/Gemfile.lock index 76bd8fd..dd96a89 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -106,6 +106,7 @@ GEM mail (~> 2.2) equalizer (0.0.9) erubis (2.7.0) + excon (0.32.1) execjs (2.0.2) factory_girl (4.3.0) activesupport (>= 3.0.0) @@ -117,6 +118,23 @@ GEM fastercsv (1.5.5) ffaker (1.22.1) ffi (1.9.3) + fog (1.21.0) + fog-brightbox + fog-core (~> 1.21, >= 1.21.1) + fog-json + nokogiri (~> 1.5, >= 1.5.11) + fog-brightbox (0.0.1) + fog-core + fog-json + fog-core (1.21.1) + builder + excon (~> 0.32) + formatador (~> 0.2.0) + mime-types + net-scp (~> 1.1) + net-ssh (>= 2.1.3) + fog-json (1.0.0) + multi_json (~> 1.0) font-awesome-rails (3.2.1.3) railties (>= 3.2, < 5.0) foreman (0.63.0) @@ -198,6 +216,9 @@ GEM multipart-post (2.0.0) mysql2 (0.3.14) nested_form (0.3.2) + net-scp (1.1.2) + net-ssh (>= 2.6.5) + net-ssh (2.8.0) nokogiri (1.6.0) mini_portile (~> 0.5.0) nprogress-rails (0.1.2.3) @@ -349,6 +370,9 @@ GEM uglifier (2.3.2) execjs (>= 0.3.0) json (>= 1.8.0) + unf (0.1.4) + unf_ext + unf_ext (0.0.6) unicorn (4.8.2) kgio (~> 2.6) rack @@ -388,6 +412,7 @@ DEPENDENCIES email_spec factory_girl_rails ffaker + fog (~> 1.14) font-awesome-rails (~> 3.2) foreman gitlab_ci_meta (~> 4.0) @@ -432,6 +457,7 @@ DEPENDENCIES state_machine turbolinks uglifier (>= 1.0.3) + unf unicorn (~> 4.8.2) virtus (= 1.0.1) webmock |