summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorNihad Abbasov <narkoz.2008@gmail.com>2012-09-03 03:43:19 -0700
committerNihad Abbasov <narkoz.2008@gmail.com>2012-09-03 03:43:19 -0700
commit6745812c7236e8d4f463e226feb2e61389c85563 (patch)
tree4391fb3051f0e9e9da0debcc8e8a306b4e564a0b /Gemfile.lock
parentcc03600b22342a541ab1b4617eaf4d38d6d2d1da (diff)
downloadgitlab-ce-6745812c7236e8d4f463e226feb2e61389c85563.tar.gz
bump kaminari
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock9
1 files changed, 4 insertions, 5 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index f226c931bff..7ec37f59dfc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -198,7 +198,7 @@ GEM
httparty (0.8.3)
multi_json (~> 1.0)
multi_xml
- i18n (0.6.0)
+ i18n (0.6.1)
journey (1.0.4)
jquery-rails (2.0.2)
railties (>= 3.2.0, < 5.0)
@@ -206,11 +206,10 @@ GEM
jquery-ui-rails (0.5.0)
jquery-rails
railties (>= 3.1.0)
- json (1.7.4)
- kaminari (0.13.0)
+ json (1.7.5)
+ kaminari (0.14.0)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
- railties (>= 3.0.0)
kgio (2.7.4)
launchy (2.1.0)
addressable (~> 2.2.6)
@@ -348,7 +347,7 @@ GEM
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
- thor (0.15.4)
+ thor (0.16.0)
tilt (1.3.3)
treetop (1.4.10)
polyglot