nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

upgrade resque, sass, jammit, fixture_builder

Browse source
This commit is contained in:
Daniel Grippi 2011-12-05 23:07:30 -08:00
parent f99dd3683d
commit bd0d4f9ca8
2 changed files with 21 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Gemfile
View file

@ -34,7 +34,7 @@ gem 'ohai', '0.5.8', :require => false
gem 'settingslogic', '2.0.6' gem 'settingslogic', '2.0.6'
# database # database
gem 'activerecord-import' gem 'activerecord-import'
gem 'foreigner', '0.9.1' gem 'foreigner', '0.9.1'
@ -49,8 +49,8 @@ gem 'carrierwave', '0.5.3'
gem 'excon', '0.2.4' gem 'excon', '0.2.4'
gem 'fastercsv', '1.5.4', :require => false gem 'fastercsv', '1.5.4', :require => false
gem 'fog', '0.3.25' gem 'fog', '0.3.25'
gem 'jammit', '0.5.4' gem 'jammit', '0.6.5'
gem 'mini_magick', '3.2' gem 'mini_magick', '3.3'
gem 'rest-client', '1.6.1' gem 'rest-client', '1.6.1'
gem 'typhoeus' gem 'typhoeus'
@ -67,13 +67,13 @@ gem 'rails-i18n'
# parsing # parsing
gem 'nokogiri' gem 'nokogiri'
gem 'redcarpet', "2.0.0b5" gem 'redcarpet', "2.0.0"
gem 'roxml', :git => 'git://github.com/Empact/roxml.git', :ref => '7ea9a9ffd2338aaef5b0' gem 'roxml', :git => 'git://github.com/Empact/roxml.git', :ref => '7ea9a9ffd2338aaef5b0'
gem 'ruby-oembed' gem 'ruby-oembed'
# queue # queue
gem 'resque', '1.10.0' gem 'resque', '1.19.0'
gem 'resque-ensure-connected' gem 'resque-ensure-connected'
gem 'resque-timeout', '1.0.0' gem 'resque-timeout', '1.0.0'
gem 'SystemTimer', '1.2.3', :platforms => :ruby_18 gem 'SystemTimer', '1.2.3', :platforms => :ruby_18
@ -100,7 +100,7 @@ gem 'http_accept_language', :git => 'git://github.com/iain/http_accept_language.
gem 'haml', '3.1.4' gem 'haml', '3.1.4'
gem 'mobile-fu' gem 'mobile-fu'
gem 'sass', '3.1.7' gem 'sass', '3.1.11'
gem 'will_paginate', '3.0.pre2' gem 'will_paginate', '3.0.pre2'
gem 'client_side_validations' gem 'client_side_validations'
@ -128,7 +128,7 @@ group :test do
gem 'diaspora-client', :git => 'git://github.com/diaspora/diaspora-client.git' gem 'diaspora-client', :git => 'git://github.com/diaspora/diaspora-client.git'
#"0.1.0", #:path => '~/workspace/diaspora-client' #"0.1.0", #:path => '~/workspace/diaspora-client'
gem 'factory_girl_rails' gem 'factory_girl_rails'
gem 'fixture_builder', '0.3.0' gem 'fixture_builder', '0.3.1'
gem 'fuubar', '0.0.5' gem 'fuubar', '0.0.5'
gem 'mongrel', :require => false, :platforms => :ruby_18 gem 'mongrel', :require => false, :platforms => :ruby_18
gem 'rspec', '>= 2.0.0' gem 'rspec', '>= 2.0.0'

30
Gemfile.lock
View file

@ -132,7 +132,6 @@ GEM
childprocess (0.2.3) childprocess (0.2.3)
ffi (~> 1.0.6) ffi (~> 1.0.6)
client_side_validations (3.1.3) client_side_validations (3.1.3)
closure-compiler (1.1.4)
cloudfiles (1.4.10) cloudfiles (1.4.10)
mime-types (>= 1.16) mime-types (>= 1.16)
columnize (0.3.5) columnize (0.3.5)
@ -183,7 +182,7 @@ GEM
fastercsv (1.5.4) fastercsv (1.5.4)
fastthread (1.0.7) fastthread (1.0.7)
ffi (1.0.11) ffi (1.0.11)
fixture_builder (0.3.0) fixture_builder (0.3.1)
activerecord (>= 2) activerecord (>= 2)
activesupport (>= 2) activesupport (>= 2)
fog (0.3.25) fog (0.3.25)
@ -221,9 +220,8 @@ GEM
actionpack (~> 3.0) actionpack (~> 3.0)
i18n-inflector (~> 2.6) i18n-inflector (~> 2.6)
railties (~> 3.0) railties (~> 3.0)
jammit (0.5.4) jammit (0.6.5)
closure-compiler (>= 0.1.0) yui-compressor (>= 0.9.3)
yui-compressor (>= 0.9.1)
jasmine (1.1.0.rc3) jasmine (1.1.0.rc3)
jasmine-core (>= 1.1.0.rc2) jasmine-core (>= 1.1.0.rc2)
rack (>= 1.1) rack (>= 1.1)
@ -335,13 +333,13 @@ GEM
rake (0.9.2.2) rake (0.9.2.2)
rdoc (3.11) rdoc (3.11)
json (~> 1.4) json (~> 1.4)
redcarpet (2.0.0b5) redcarpet (2.0.0)
redis (2.2.2) redis (2.2.2)
redis-namespace (0.8.0) redis-namespace (1.0.3)
redis (< 3.0.0) redis (< 3.0.0)
resque (1.10.0) resque (1.19.0)
json (~> 1.4.6) multi_json (~> 1.0)
redis-namespace (~> 0.8.0) redis-namespace (~> 1.0.2)
sinatra (>= 0.9.2) sinatra (>= 0.9.2)
vegas (~> 0.1.2) vegas (~> 0.1.2)
resque-ensure-connected (0.2.0) resque-ensure-connected (0.2.0)
@ -384,7 +382,7 @@ GEM
ruby_core_source (0.1.5) ruby_core_source (0.1.5)
archive-tar-minitar (>= 0.5.2) archive-tar-minitar (>= 0.5.2)
rubyzip (0.9.5) rubyzip (0.9.5)
sass (3.1.7) sass (3.1.11)
selenium-webdriver (2.14.0) selenium-webdriver (2.14.0)
childprocess (>= 0.2.1) childprocess (>= 0.2.1)
ffi (~> 1.0.9) ffi (~> 1.0.9)
@ -461,7 +459,7 @@ DEPENDENCIES
faraday faraday
faraday-stack faraday-stack
fastercsv (= 1.5.4) fastercsv (= 1.5.4)
fixture_builder (= 0.3.0) fixture_builder (= 0.3.1)
fog (= 0.3.25) fog (= 0.3.25)
foreigner (= 0.9.1) foreigner (= 0.9.1)
foreman foreman
@ -470,7 +468,7 @@ DEPENDENCIES
hoptoad_notifier hoptoad_notifier
http_accept_language! http_accept_language!
i18n-inflector-rails (~> 1.0) i18n-inflector-rails (~> 1.0)
jammit (= 0.5.4) jammit (= 0.6.5)
jasmine (= 1.1.0.rc3) jasmine (= 1.1.0.rc3)
json (= 1.4.6) json (= 1.4.6)
jwt (= 0.1.3) jwt (= 0.1.3)
@ -492,8 +490,8 @@ DEPENDENCIES
parallel_tests parallel_tests
rails (= 3.0.11) rails (= 3.0.11)
rails-i18n rails-i18n
redcarpet (= 2.0.0b5) redcarpet (= 2.0.0)
resque (= 1.10.0) resque (= 1.19.0)
resque-ensure-connected resque-ensure-connected
resque-timeout (= 1.0.0) resque-timeout (= 1.0.0)
rest-client (= 1.6.1) rest-client (= 1.6.1)
@ -505,7 +503,7 @@ DEPENDENCIES
ruby-debug ruby-debug
ruby-debug19 ruby-debug19
ruby-oembed ruby-oembed
sass (= 3.1.7) sass (= 3.1.11)
selenium-webdriver (~> 2.14.0) selenium-webdriver (~> 2.14.0)
settingslogic (= 2.0.6) settingslogic (= 2.0.6)
sod! sod!