deac/photomix
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

bundle update

Browse source
This commit is contained in:
Espen Antonsen 2011-09-25 14:51:06 +08:00
parent d0e2834b1b
commit bb3eb2bc13
2 changed files with 55 additions and 81 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Gemfile
View file

@ -1,6 +1,6 @@
source 'http://rubygems.org'
gem 'rails', '3.1.0'
gem 'rails', '3.0.10'
gem 'authlogic'
@ -8,13 +8,12 @@ gem 'mime-types', :require => 'mime/types'
gem 'carrierwave'
# -- Heroku
# Uncomment both and enable required db adapter below
gem 'heroku'
gem 'pg'
#gem 'heroku'
#gem 'pg'
# -- Database
# SQLite:
#gem 'sqlite3-ruby'
gem 'sqlite3-ruby'
# MySQL:
#gem 'mysql2', '~> 0.2.7' # Use version 0.3 and up for Rails 3.1
# PostgreSQL:

127
Gemfile.lock
View file

@ -1,45 +1,42 @@
GEM
remote: http://rubygems.org/
specs:
actionmailer (3.1.0)
actionpack (= 3.1.0)
mail (~> 2.3.0)
actionpack (3.1.0)
activemodel (= 3.1.0)
activesupport (= 3.1.0)
builder (~> 3.0.0)
erubis (~> 2.7.0)
i18n (~> 0.6)
rack (~> 1.3.2)
rack-cache (~> 1.0.3)
rack-mount (~> 0.8.2)
rack-test (~> 0.6.1)
sprockets (~> 2.0.0)
activemodel (3.1.0)
activesupport (= 3.1.0)
bcrypt-ruby (~> 3.0.0)
builder (~> 3.0.0)
i18n (~> 0.6)
activerecord (3.1.0)
activemodel (= 3.1.0)
activesupport (= 3.1.0)
arel (~> 2.2.1)
tzinfo (~> 0.3.29)
activeresource (3.1.0)
activemodel (= 3.1.0)
activesupport (= 3.1.0)
activesupport (3.1.0)
multi_json (~> 1.0)
addressable (2.2.6)
arel (2.2.1)
abstract (1.0.0)
actionmailer (3.0.10)
actionpack (= 3.0.10)
mail (~> 2.2.19)
actionpack (3.0.10)
activemodel (= 3.0.10)
activesupport (= 3.0.10)
builder (~> 2.1.2)
erubis (~> 2.6.6)
i18n (~> 0.5.0)
rack (~> 1.2.1)
rack-mount (~> 0.6.14)
rack-test (~> 0.5.7)
tzinfo (~> 0.3.23)
activemodel (3.0.10)
activesupport (= 3.0.10)
builder (~> 2.1.2)
i18n (~> 0.5.0)
activerecord (3.0.10)
activemodel (= 3.0.10)
activesupport (= 3.0.10)
arel (~> 2.0.10)
tzinfo (~> 0.3.23)
activeresource (3.0.10)
activemodel (= 3.0.10)
activesupport (= 3.0.10)
activesupport (3.0.10)
arel (2.0.10)
authlogic (3.0.3)
activerecord (>= 3.0.7)
activerecord (>= 3.0.7)
bcrypt-ruby (3.0.1)
builder (3.0.0)
builder (2.1.2)
carrierwave (0.5.7)
activesupport (~> 3.0)
erubis (2.7.0)
erubis (2.6.6)
abstract (>= 1.0.0)
excon (0.6.6)
fog (0.11.0)
builder
@ -52,16 +49,9 @@ GEM
nokogiri (~> 1.5.0)
ruby-hmac
formatador (0.2.1)
heroku (2.8.1)
launchy (>= 0.3.2)
rest-client (~> 1.6.1)
rubyzip
term-ansicolor (~> 1.0.5)
hike (1.2.1)
i18n (0.6.0)
launchy (2.0.5)
addressable (~> 2.2.6)
mail (2.3.0)
i18n (0.5.0)
mail (2.2.19)
activesupport (>= 2.3.6)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
@ -70,50 +60,36 @@ GEM
mini_magick (3.3)
subexec (~> 0.1.0)
multi_json (1.0.3)
mysql2 (0.2.13)
net-scp (1.0.4)
net-ssh (>= 1.99.1)
net-ssh (2.1.4)
nokogiri (1.5.0)
pg (0.11.0)
polyglot (0.3.2)
rack (1.3.3)
rack-cache (1.0.3)
rack (>= 0.4)
rack-mount (0.8.3)
rack (1.2.4)
rack-mount (0.6.14)
rack (>= 1.0.0)
rack-ssl (1.3.2)
rack
rack-test (0.6.1)
rack-test (0.5.7)
rack (>= 1.0)
rails (3.1.0)
actionmailer (= 3.1.0)
actionpack (= 3.1.0)
activerecord (= 3.1.0)
activeresource (= 3.1.0)
activesupport (= 3.1.0)
rails (3.0.10)
actionmailer (= 3.0.10)
actionpack (= 3.0.10)
activerecord (= 3.0.10)
activeresource (= 3.0.10)
activesupport (= 3.0.10)
bundler (~> 1.0)
railties (= 3.1.0)
railties (3.1.0)
actionpack (= 3.1.0)
activesupport (= 3.1.0)
rack-ssl (~> 1.3.2)
railties (= 3.0.10)
railties (3.0.10)
actionpack (= 3.0.10)
activesupport (= 3.0.10)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (~> 0.14.6)
thor (~> 0.14.4)
rake (0.9.2)
rdoc (3.9.4)
rest-client (1.6.7)
mime-types (>= 1.16)
ruby-hmac (0.4.0)
rubyzip (0.9.4)
sprockets (2.0.0)
hike (~> 1.2)
rack (~> 1.0)
tilt (!= 1.3.0, ~> 1.1)
subexec (0.1.0)
term-ansicolor (1.0.6)
thor (0.14.6)
tilt (1.3.3)
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
@ -126,9 +102,8 @@ DEPENDENCIES
authlogic
carrierwave
fog
heroku
mime-types
mini_exiftool
mini_magick
pg
rails (= 3.1.0)
mysql2 (~> 0.2.7)
rails (= 3.0.10)