Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-03-01 17:15:29 +0400
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-03-01 17:15:29 +0400
commit520f02259c7076ca44f298dd401ef9df2ac8c0d3 (patch)
tree0e7a44510f2193aaaa471eab61b6d9f442696452 /Gemfile.lock
parent153a4c142df90f769df68b333f533c639f923148 (diff)
gems updated: unicorn, draper, github-markup
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock18
1 files changed, 10 insertions, 8 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index a375fdd8307..f70c8735276 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -135,9 +135,10 @@ GEM
railties (~> 3.1)
warden (~> 1.2.1)
diff-lcs (1.1.3)
- draper (0.18.0)
- actionpack (~> 3.2)
- activesupport (~> 3.2)
+ draper (1.1.0)
+ actionpack (>= 3.0)
+ activesupport (>= 3.0)
+ request_store (~> 1.0.3)
email_spec (1.4.0)
launchy (~> 2.1)
mail (~> 2.2)
@@ -173,7 +174,7 @@ GEM
escape_utils (~> 0.2.3)
mime-types (~> 1.19)
pygments.rb (>= 0.2.13)
- github-markup (0.7.4)
+ github-markup (0.7.5)
gitlab_meta (5.0)
gitlab_omniauth-ldap (1.0.2)
net-ldap (~> 0.2.2)
@@ -236,7 +237,7 @@ GEM
kaminari (0.14.1)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
- kgio (2.7.4)
+ kgio (2.8.0)
launchy (2.1.2)
addressable (~> 2.3)
letter_opener (1.0.0)
@@ -351,6 +352,7 @@ GEM
redis (3.0.2)
redis-namespace (1.2.1)
redis (~> 3.0.0)
+ request_store (1.0.5)
rspec (2.12.0)
rspec-core (~> 2.12.0)
rspec-expectations (~> 2.12.0)
@@ -439,7 +441,7 @@ GEM
uglifier (1.3.0)
execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2)
- unicorn (4.4.0)
+ unicorn (4.6.2)
kgio (~> 2.6)
rack
raindrops (~> 0.7)
@@ -473,7 +475,7 @@ DEPENDENCIES
colored
database_cleaner
devise
- draper (~> 0.18.0)
+ draper
email_spec
enumerize
factory_girl_rails
@@ -541,5 +543,5 @@ DEPENDENCIES
therubyracer
thin
uglifier (~> 1.3.0)
- unicorn (~> 4.4.0)
+ unicorn
webmock