github-migration/engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated gemfile with kaminari again.

Browse Source
This commit is contained in:
Mario Visic 2011-11-20 21:36:10 +11:00
parent e6c1d6e94e
commit 769cf7548c
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -13,7 +13,7 @@ gem 'bson_ext', '~> 1.4.0'
gem 'mongoid', '~> 2.3.2' gem 'mongoid', '~> 2.3.2'
gem 'locomotive_mongoid_acts_as_tree', :git => 'git@github.com:locomotivecms/mongoid_acts_as_tree.git' gem 'locomotive_mongoid_acts_as_tree', :git => 'git@github.com:locomotivecms/mongoid_acts_as_tree.git'
gem 'custom_fields', :git => 'git://github.com/locomotivecms/custom_fields.git', :branch => 'mongoid_2_3_2' gem 'custom_fields', :git => 'git://github.com/locomotivecms/custom_fields.git', :branch => 'mongoid_2_3_2'
gem 'will_paginate', '~> 3.0.2' gem 'kaminari'
gem 'haml', '~> 3.1.3' gem 'haml', '~> 3.1.3'
gem 'sass-rails', '~> 3.1.4' gem 'sass-rails', '~> 3.1.4'

5
Gemfile.lock
View File

@ -184,6 +184,8 @@ GEM
thor (~> 0.14) thor (~> 0.14)
json (1.6.1) json (1.6.1)
json_pure (1.6.1) json_pure (1.6.1)
kaminari (0.12.4)
rails (>= 3.0.0)
kgio (2.6.0) kgio (2.6.0)
launchy (2.0.5) launchy (2.0.5)
addressable (~> 2.2.6) addressable (~> 2.2.6)
@ -321,7 +323,6 @@ GEM
raindrops (~> 0.6) raindrops (~> 0.6)
warden (1.1.0) warden (1.1.0)
rack (>= 1.0) rack (>= 1.0)
will_paginate (3.0.2)
xpath (0.1.4) xpath (0.1.4)
nokogiri (~> 1.3) nokogiri (~> 1.3)
@ -360,6 +361,7 @@ DEPENDENCIES
highline (~> 1.6.2) highline (~> 1.6.2)
httparty (~> 0.8.1) httparty (~> 0.8.1)
jquery-rails (~> 1.0.16) jquery-rails (~> 1.0.16)
kaminari
launchy launchy
linecache (= 0.43) linecache (= 0.43)
locomotive_liquid (= 2.2.2) locomotive_liquid (= 2.2.2)
@ -386,5 +388,4 @@ DEPENDENCIES
uglifier (~> 1.0.4) uglifier (~> 1.0.4)
unicorn unicorn
uploadify-rails! uploadify-rails!
will_paginate (~> 3.0.2)
xpath (~> 0.1.4) xpath (~> 0.1.4)

4
lib/locomotive/dependencies.rb
View File

@ -2,7 +2,7 @@ require 'devise'
require 'mongoid' require 'mongoid'
require 'mongoid/railtie' require 'mongoid/railtie'
require 'mongoid_acts_as_tree' require 'mongoid_acts_as_tree'
require 'will_paginate' require 'kaminari'
require 'haml' require 'haml'
require 'liquid' require 'liquid'
require 'formtastic' require 'formtastic'
@ -19,4 +19,4 @@ require 'dragonfly'
require 'cancan' require 'cancan'
require 'RMagick' require 'RMagick'
require 'cells' require 'cells'
require 'sanitize' require 'sanitize'