Skip to content
Browse files

updated to rails 3.0.10. Fixed Rmagick and replaced with minimagick

  • Loading branch information...
1 parent 12ff5de commit 61c099594b379b318ab285e1d3b5d46d2cf98469 @danbronsema committed
Showing with 58 additions and 50 deletions.
  1. +2 −0 .gitignore
  2. +2 −2 Gemfile
  3. +52 −47 Gemfile.lock
  4. +1 −1 app/uploaders/image_uploader.rb
  5. +1 −0 db/schema.rb
View
2 .gitignore
@@ -2,3 +2,5 @@
db/*.sqlite3
log/*.log
tmp/**/*
+public
+
View
4 Gemfile
@@ -1,13 +1,13 @@
source 'http://rubygems.org'
-gem 'rails', '3.0.3'
+gem 'rails'
# Bundle edge Rails instead:
# gem 'rails', :git => 'git://github.com/rails/rails.git'
gem 'sqlite3-ruby', :require => 'sqlite3'
gem 'carrierwave'
-gem 'rmagick'
+gem 'mini_magick'
gem "jquery-rails"
gem "nested_form"
View
99 Gemfile.lock
@@ -2,77 +2,82 @@ GEM
remote: http://rubygems.org/
specs:
abstract (1.0.0)
- actionmailer (3.0.3)
- actionpack (= 3.0.3)
- mail (~> 2.2.9)
- actionpack (3.0.3)
- activemodel (= 3.0.3)
- activesupport (= 3.0.3)
+ 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.4)
+ i18n (~> 0.5.0)
rack (~> 1.2.1)
- rack-mount (~> 0.6.13)
- rack-test (~> 0.5.6)
+ rack-mount (~> 0.6.14)
+ rack-test (~> 0.5.7)
tzinfo (~> 0.3.23)
- activemodel (3.0.3)
- activesupport (= 3.0.3)
+ activemodel (3.0.10)
+ activesupport (= 3.0.10)
builder (~> 2.1.2)
- i18n (~> 0.4)
- activerecord (3.0.3)
- activemodel (= 3.0.3)
- activesupport (= 3.0.3)
- arel (~> 2.0.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.3)
- activemodel (= 3.0.3)
- activesupport (= 3.0.3)
- activesupport (3.0.3)
- arel (2.0.8)
+ activeresource (3.0.10)
+ activemodel (= 3.0.10)
+ activesupport (= 3.0.10)
+ activesupport (3.0.10)
+ arel (2.0.10)
builder (2.1.2)
- carrierwave (0.5.1)
+ carrierwave (0.5.7)
activesupport (~> 3.0)
erubis (2.6.6)
abstract (>= 1.0.0)
i18n (0.5.0)
- jquery-rails (0.2.7)
- rails (~> 3.0)
- thor (~> 0.14.4)
- mail (2.2.15)
+ jquery-rails (1.0.13)
+ railties (~> 3.0)
+ thor (~> 0.14)
+ mail (2.2.19)
activesupport (>= 2.3.6)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.16)
- nested_form (0.0.0)
- polyglot (0.3.1)
- rack (1.2.1)
- rack-mount (0.6.13)
+ mini_magick (3.3)
+ subexec (~> 0.1.0)
+ nested_form (0.1.1)
+ polyglot (0.3.2)
+ rack (1.2.3)
+ rack-mount (0.6.14)
rack (>= 1.0.0)
rack-test (0.5.7)
rack (>= 1.0)
- rails (3.0.3)
- actionmailer (= 3.0.3)
- actionpack (= 3.0.3)
- activerecord (= 3.0.3)
- activeresource (= 3.0.3)
- activesupport (= 3.0.3)
+ 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.0.3)
- railties (3.0.3)
- actionpack (= 3.0.3)
- activesupport (= 3.0.3)
+ 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.4)
- rake (0.8.7)
- rmagick (2.13.1)
- sqlite3 (1.3.3)
+ rake (0.9.2)
+ rdoc (3.9.2)
+ sqlite3 (1.3.4)
sqlite3-ruby (1.3.3)
sqlite3 (>= 1.3.3)
+ subexec (0.1.0)
thor (0.14.6)
- treetop (1.4.9)
+ treetop (1.4.10)
+ polyglot
polyglot (>= 0.3.1)
- tzinfo (0.3.24)
+ tzinfo (0.3.29)
PLATFORMS
ruby
@@ -80,7 +85,7 @@ PLATFORMS
DEPENDENCIES
carrierwave
jquery-rails
+ mini_magick
nested_form
- rails (= 3.0.3)
- rmagick
+ rails
sqlite3-ruby
View
2 app/uploaders/image_uploader.rb
@@ -3,7 +3,7 @@
class ImageUploader < CarrierWave::Uploader::Base
# Include RMagick or ImageScience support:
- include CarrierWave::RMagick
+ include CarrierWave::MiniMagick
# include CarrierWave::ImageScience
# Choose what kind of storage to use for this uploader:
View
1 db/schema.rb
@@ -1,3 +1,4 @@
+# encoding: UTF-8
# This file is auto-generated from the current state of the database. Instead
# of editing this file, please use the migrations feature of Active Record to
# incrementally modify your database, and then regenerate this schema definition.

0 comments on commit 61c0995

Please sign in to comment.
Something went wrong with that request. Please try again.