Skip to content

Commit

Permalink
update gemfile
Browse files Browse the repository at this point in the history
  • Loading branch information
@akirill0v
akirill0v committed Jun 21, 2012
1 parent db8479b commit 55c6104
Show file tree
Hide file tree
Showing 2 changed files with 67 additions and 64 deletions.
8 changes: 4 additions & 4 deletions Gemfile
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
source 'https://rubygems.org'

gem 'rails', '3.2.3'
gem 'rails', '3.2.5'

# Bundle edge Rails instead:
# gem 'rails', :git => 'git://github.com/rails/rails.git'
Expand All @@ -10,12 +10,12 @@ gem 'rails', '3.2.3'
# Gems used only for assets and not required
# in production environments by default.
group :assets do
gem 'sass-rails', '~> 3.2.3'
gem 'coffee-rails', '~> 3.2.1'
gem 'sass-rails'
gem 'coffee-rails'

# See https://github.com/sstephenson/execjs#readme for more supported runtimes
gem 'therubyracer', :platform => :ruby
gem 'compass-rails', '~> 1.0.0.rc.3'
gem 'compass-rails'

gem 'uglifier', '>= 1.0.3'
end
Expand Down
123 changes: 63 additions & 60 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
GIT
remote: git://github.com/locomotivecms/engine.git
revision: b751e3d9902deb1117924ef2f36d682fae99c1a1
revision: fbcda9cdd6d34c889c617010e25efdaeebe427e7
specs:
locomotive_cms (2.0.0.rc7)
locomotive_cms (2.0.0.rc8)
RedCloth (~> 4.2.8)
actionmailer-with-request (~> 0.3.0)
bson_ext (~> 1.5.2)
cancan (~> 1.6.7)
carrierwave (~> 0.6.0)
carrierwave-mongoid (~> 0.1.3)
carrierwave-mongoid (~> 0.2.1)
cells (~> 3.8.0)
codemirror-rails (~> 2.21)
custom_fields (~> 2.0.0.rc10)
devise (~> 1.5.3)
custom_fields (~> 2.0.0.rc12)
devise (~> 2.1.0)
devise-encryptable (~> 0.1.1)
dragonfly (~> 0.9.8)
flash_cookie_session (~> 1.1.1)
fog (~> 1.3.1)
formtastic (~> 2.0.2)
haml (~> 3.1.4)
haml (~> 3.1.6)
highline (~> 1.6.2)
httparty (~> 0.8.1)
jquery-rails (~> 1.0.19)
Expand All @@ -31,7 +31,7 @@ GIT
mongoid (~> 2.4.9)
multi_json (~> 1.3.4)
rack-cache (~> 1.1)
rails (~> 3.2.3)
rails (~> 3.2.5)
rails-backbone (~> 0.6.1)
rake (~> 0.9.2)
responders (~> 0.6.4)
Expand All @@ -43,33 +43,33 @@ GEM
remote: https://rubygems.org/
specs:
RedCloth (4.2.9)
actionmailer (3.2.3)
actionpack (= 3.2.3)
actionmailer (3.2.5)
actionpack (= 3.2.5)
mail (~> 2.4.4)
actionmailer-with-request (0.3.0)
rails (>= 3)
actionpack (3.2.3)
activemodel (= 3.2.3)
activesupport (= 3.2.3)
actionpack (3.2.5)
activemodel (= 3.2.5)
activesupport (= 3.2.5)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.1)
rack (~> 1.4.0)
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.1.2)
activemodel (3.2.3)
activesupport (= 3.2.3)
sprockets (~> 2.1.3)
activemodel (3.2.5)
activesupport (= 3.2.5)
builder (~> 3.0.0)
activerecord (3.2.3)
activemodel (= 3.2.3)
activesupport (= 3.2.3)
activerecord (3.2.5)
activemodel (= 3.2.5)
activesupport (= 3.2.5)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
activeresource (3.2.3)
activemodel (= 3.2.3)
activesupport (= 3.2.3)
activesupport (3.2.3)
activeresource (3.2.5)
activemodel (= 3.2.5)
activesupport (= 3.2.5)
activesupport (3.2.5)
i18n (~> 0.6)
multi_json (~> 1.0)
arel (3.0.2)
Expand All @@ -88,8 +88,8 @@ GEM
carrierwave (0.6.2)
activemodel (>= 3.2.0)
activesupport (>= 3.2.0)
carrierwave-mongoid (0.1.3)
carrierwave (>= 0.5.6)
carrierwave-mongoid (0.2.1)
carrierwave (~> 0.6.1)
mongoid (~> 2.1)
cells (3.8.5)
actionpack (~> 3.0)
Expand All @@ -108,16 +108,19 @@ GEM
chunky_png (~> 1.2)
fssm (>= 0.2.7)
sass (~> 3.1)
compass-rails (1.0.1)
compass (~> 0.12.0)
custom_fields (2.0.0.rc10)
compass-rails (1.0.2)
compass (>= 0.12.0, < 0.14)
custom_fields (2.0.0.rc12)
activesupport (~> 3.2.1)
carrierwave-mongoid (~> 0.1.3)
mongoid (~> 2.4.7)
devise (1.5.3)
carrierwave-mongoid (~> 0.2.1)
mongoid (~> 2.4.9)
devise (2.1.2)
bcrypt-ruby (~> 3.0)
orm_adapter (~> 0.0.3)
warden (~> 1.1)
orm_adapter (~> 0.1)
railties (~> 3.1)
warden (~> 1.2.1)
devise-encryptable (0.1.1)
devise (>= 2.1.0.rc)
dragonfly (0.9.12)
rack
ejs (1.0.0)
Expand All @@ -142,13 +145,13 @@ GEM
rails (~> 3.0)
fssm (0.2.9)
haml (3.1.6)
highline (1.6.12)
highline (1.6.13)
hike (1.2.1)
httparty (0.8.3)
multi_json (~> 1.0)
multi_xml
i18n (0.6.0)
journey (1.0.3)
journey (1.0.4)
jquery-rails (1.0.19)
railties (~> 3.0)
thor (~> 0.14)
Expand All @@ -174,9 +177,9 @@ GEM
mimetype-fu (0.1.2)
mongo (1.5.2)
bson (= 1.5.2)
mongoid (2.4.10)
mongoid (2.4.11)
activemodel (~> 3.1)
mongo (~> 1.3)
mongo (<= 1.6.2)
tzinfo (~> 0.3.22)
multi_json (1.3.6)
multi_xml (0.5.1)
Expand All @@ -187,8 +190,8 @@ GEM
net-ssh (2.5.2)
net-ssh-gateway (1.1.0)
net-ssh (>= 1.99.1)
nokogiri (1.5.2)
orm_adapter (0.0.7)
nokogiri (1.5.4)
orm_adapter (0.3.0)
polyglot (0.3.3)
rack (1.4.1)
rack-cache (1.2)
Expand All @@ -197,33 +200,33 @@ GEM
rack
rack-test (0.6.1)
rack (>= 1.0)
rails (3.2.3)
actionmailer (= 3.2.3)
actionpack (= 3.2.3)
activerecord (= 3.2.3)
activeresource (= 3.2.3)
activesupport (= 3.2.3)
rails (3.2.5)
actionmailer (= 3.2.5)
actionpack (= 3.2.5)
activerecord (= 3.2.5)
activeresource (= 3.2.5)
activesupport (= 3.2.5)
bundler (~> 1.0)
railties (= 3.2.3)
railties (= 3.2.5)
rails-backbone (0.6.1)
coffee-script (~> 2.2.0)
ejs (~> 1.0.0)
railties (>= 3.1.0)
railties (3.2.3)
actionpack (= 3.2.3)
activesupport (= 3.2.3)
railties (3.2.5)
actionpack (= 3.2.5)
activesupport (= 3.2.5)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (~> 0.14.6)
raindrops (0.9.0)
thor (>= 0.14.6, < 2.0)
raindrops (0.10.0)
rake (0.9.2.2)
rdoc (3.12)
json (~> 1.4)
responders (0.6.5)
rmagick (2.12.2)
ruby-hmac (0.4.0)
rvm-capistrano (1.1.0)
rvm-capistrano (1.2.2)
capistrano (>= 2.0.0)
sanitize (2.0.3)
nokogiri (>= 1.4.4, < 1.6)
Expand All @@ -238,34 +241,34 @@ GEM
tilt (~> 1.1, != 1.3.0)
therubyracer (0.10.1)
libv8 (~> 3.3.10)
thor (0.14.6)
thor (0.15.3)
tilt (1.3.3)
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.33)
uglifier (1.2.4)
uglifier (1.2.5)
execjs (>= 0.3.0)
multi_json (>= 1.0.2)
multi_json (~> 1.3)
unicorn (4.3.1)
kgio (~> 2.6)
rack
raindrops (~> 0.7)
unidecoder (1.1.1)
warden (1.2.0)
warden (1.2.1)
rack (>= 1.0)

PLATFORMS
ruby

DEPENDENCIES
capistrano
coffee-rails (~> 3.2.1)
compass-rails (~> 1.0.0.rc.3)
coffee-rails
compass-rails
locomotive_cms!
rails (= 3.2.3)
rails (= 3.2.5)
rvm-capistrano
sass-rails (~> 3.2.3)
sass-rails
therubyracer
uglifier (>= 1.0.3)
unicorn

0 comments on commit 55c6104

Please sign in to comment.