diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-07-08 09:47:31 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-07-08 09:47:31 +0300 |
| commit | 6f5f5e7ee32bbd693796571fa6fcb8575accc08a (patch) | |
| tree | 6e68470aaeaae5d57bcf162ce0085641ab95dbbd /Gemfile.lock | |
| parent | cefd8fe2fac3e8056f48073529ffc52d1e0af678 (diff) | |
| download | gitlab-ce-6f5f5e7ee32bbd693796571fa6fcb8575accc08a.tar.gz | |
Add suppoort of unicorn and fog gems
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 27 |
1 files changed, 25 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 313d2ffbca5..d26f4d8a28f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -116,6 +116,7 @@ GEM erubis (2.7.0) escape_utils (0.2.4) eventmachine (1.0.3) + excon (0.13.4) execjs (1.4.0) multi_json (~> 1.0) factory_girl (4.2.0) @@ -131,6 +132,16 @@ GEM eventmachine (>= 0.12.0) ffaker (1.16.0) ffi (1.8.1) + fog (1.3.1) + builder + excon (~> 0.13.0) + formatador (~> 0.2.0) + mime-types + multi_json (~> 1.0) + net-scp (~> 1.0.4) + net-ssh (>= 2.1.3) + nokogiri (~> 1.5.0) + ruby-hmac font-awesome-rails (3.1.1.3) railties (>= 3.2, < 5.0) foreman (0.63.0) @@ -243,6 +254,7 @@ GEM kaminari (0.14.1) actionpack (>= 3.0.0) activesupport (>= 3.0.0) + kgio (2.8.0) launchy (2.2.0) addressable (~> 2.3) letter_opener (1.1.0) @@ -267,6 +279,9 @@ GEM multipart-post (1.2.0) mysql2 (0.3.11) net-ldap (0.3.1) + net-scp (1.0.4) + net-ssh (>= 1.99.1) + net-ssh (2.6.8) nokogiri (1.5.9) oauth (0.4.7) oauth2 (0.8.1) @@ -305,7 +320,7 @@ GEM coderay (~> 1.0.5) method_source (~> 0.8) slop (~> 3.4) - puma (2.0.1) + puma (2.3.1) rack (>= 1.1, < 2.0) pygments.rb (0.4.2) posix-spawn (~> 0.3.6) @@ -354,6 +369,7 @@ GEM rake (>= 0.8.7) rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) + raindrops (0.11.0) rake (10.0.4) rb-fsevent (0.9.3) rb-inotify (0.9.0) @@ -400,6 +416,7 @@ GEM rspec-core (~> 2.13.0) rspec-expectations (~> 2.13.0) rspec-mocks (~> 2.13.0) + ruby-hmac (0.4.0) ruby-progressbar (1.0.2) rubyntlm (0.1.1) rubyzip (0.9.9) @@ -499,6 +516,10 @@ GEM execjs (>= 0.3.0) multi_json (~> 1.0, >= 1.0.2) underscore-rails (1.4.4) + unicorn (4.6.3) + kgio (~> 2.6) + rack + raindrops (~> 0.7) virtus (0.5.4) backports (~> 2.6.1) descendants_tracker (~> 0.0.1) @@ -536,6 +557,7 @@ DEPENDENCIES enumerize factory_girl_rails ffaker + fog (~> 1.3.1) font-awesome-rails (~> 3.1.1) foreman gemoji (~> 1.2.1) @@ -574,7 +596,7 @@ DEPENDENCIES pg poltergeist (~> 1.3.0) pry - puma (~> 2.0.1) + puma (~> 2.3.1) quiet_assets (~> 1.0.1) rack-mini-profiler rails (= 3.2.13) @@ -608,4 +630,5 @@ DEPENDENCIES turbolinks uglifier underscore-rails (~> 1.4.4) + unicorn (~> 4.6.3) webmock |