diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-07-08 10:50:10 +0400 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-07-08 10:50:10 +0400 |
| commit | 6ace422c298eef2c592d64c08f59b3da3d8d8a6d (patch) | |
| tree | 9a1a43baeab7e73a4a97c9d4be18a2ddbe4f257c /Gemfile.lock | |
| parent | 2882d16e7a244d6627d9f6d9436651a38bf11bad (diff) | |
| parent | 6f5f5e7ee32bbd693796571fa6fcb8575accc08a (diff) | |
Merge branch 'master' into 6-0-dev
Conflicts:
Gemfile
Gemfile.lock
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index f259f908a22..4866f9585d1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -117,6 +117,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) @@ -132,6 +133,16 @@ GEM eventmachine (>= 0.12.0) ffaker (1.16.1) ffi (1.9.0) + 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) @@ -245,6 +256,7 @@ GEM kaminari (0.14.1) actionpack (>= 3.0.0) activesupport (>= 3.0.0) + kgio (2.8.0) launchy (2.3.0) addressable (~> 2.3) letter_opener (1.1.1) @@ -268,6 +280,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.10) oauth (0.4.7) oauth2 (0.8.1) @@ -355,6 +370,7 @@ GEM rake (>= 0.8.7) rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) + raindrops (0.11.0) rake (10.1.0) rb-fsevent (0.9.3) rb-inotify (0.9.0) @@ -401,6 +417,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.1.1) rubyntlm (0.1.1) rubyzip (0.9.9) @@ -501,6 +518,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.5) backports (~> 3.3) descendants_tracker (~> 0.0.1) @@ -538,6 +559,7 @@ DEPENDENCIES enumerize factory_girl_rails ffaker + fog (~> 1.3.1) font-awesome-rails (~> 3.1.1) foreman gemoji (~> 1.2.1) @@ -610,4 +632,5 @@ DEPENDENCIES turbolinks uglifier underscore-rails (~> 1.4.4) + unicorn (~> 4.6.3) webmock |