Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #145 from mulderp/paperclip_upgrade

upgrade paperclip
  • Loading branch information...
commit 626c4ff315b4404316d371c9849663954400e97f 2 parents 9ae0992 + cdf5029
@warp warp authored
Showing with 37 additions and 24 deletions.
  1. +36 −23 Gemfile.lock
  2. +1 −1  fat_free_crm.gemspec
View
59 Gemfile.lock
@@ -62,8 +62,8 @@ GEM
acts-as-taggable-on (2.2.2)
rails (~> 3.0)
acts_as_commentable (3.0.1)
- acts_as_list (0.1.5)
- addressable (2.2.7)
+ acts_as_list (0.1.6)
+ addressable (2.2.8)
ajax-chosen-rails (0.1.5)
chosen-rails
railties (~> 3.0)
@@ -81,33 +81,34 @@ GEM
rack-test (>= 0.5.4)
selenium-webdriver (~> 2.0)
xpath (~> 0.1.4)
- childprocess (0.3.1)
+ childprocess (0.3.2)
ffi (~> 1.0.6)
chronic (0.6.7)
cocaine (0.2.1)
+ coderay (1.0.6)
coffee-rails (3.2.2)
coffee-script (>= 2.2.0)
railties (~> 3.2.0)
coffee-script (2.2.0)
coffee-script-source
execjs
- coffee-script-source (1.2.0)
+ coffee-script-source (1.3.1)
columnize (0.3.6)
css_parser (1.2.6)
addressable
rdoc
database_cleaner (0.7.2)
- debugger (1.0.0)
+ debugger (1.1.3)
columnize (>= 0.3.1)
- debugger-linecache
- debugger-ruby_core_source
- debugger-linecache (1.0.1)
- debugger-ruby_core_source
- debugger-ruby_core_source (1.0.1)
+ debugger-linecache (~> 1.1.1)
+ debugger-ruby_core_source (~> 1.1.2)
+ debugger-linecache (1.1.1)
+ debugger-ruby_core_source (>= 1.1.1)
+ debugger-ruby_core_source (1.1.2)
diff-lcs (1.1.3)
dynamic_form (1.1.4)
erubis (2.7.0)
- execjs (1.3.0)
+ execjs (1.3.1)
multi_json (~> 1.0)
factory_girl (3.0.0)
activesupport (>= 3.0.0)
@@ -129,22 +130,25 @@ GEM
jquery-rails (2.0.2)
railties (>= 3.2.0, < 5.0)
thor (~> 0.14)
- json (1.6.6)
+ json (1.7.0)
kgio (2.7.4)
libv8 (3.3.10.4)
+ libwebsocket (0.1.3)
+ addressable
linecache (0.46)
rbx-require-relative (> 0.0.4)
mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
+ method_source (0.7.1)
mime-types (1.18)
- multi_json (1.2.0)
+ multi_json (1.3.4)
nokogiri (1.5.2)
paper_trail (2.6.3)
activerecord (~> 3.0)
railties (~> 3.0)
- paperclip (3.0.1)
+ paperclip (3.0.2)
activemodel (>= 3.0.0)
activerecord (>= 3.0.0)
activesupport (>= 3.0.0)
@@ -159,6 +163,12 @@ GEM
htmlentities (>= 4.0.0)
prototype-rails (3.2.1)
rails (~> 3.2)
+ pry (0.9.9.4)
+ coderay (~> 1.0.5)
+ method_source (~> 0.7.1)
+ slop (>= 2.4.4, < 3)
+ pry-rails (0.1.6)
+ pry
rack (1.4.1)
rack-cache (1.2)
rack (>= 0.4)
@@ -206,22 +216,24 @@ GEM
ruby-debug-base (0.10.4)
linecache (>= 0.3)
ruby-progressbar (0.0.10)
- rubyzip (0.9.6.1)
- sass (3.1.15)
+ rubyzip (0.9.8)
+ sass (3.1.16)
sass-rails (3.2.5)
railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3)
- selenium-webdriver (2.20.0)
+ selenium-webdriver (2.21.2)
childprocess (>= 0.2.5)
ffi (~> 1.0)
+ libwebsocket (~> 0.1.3)
multi_json (~> 1.0)
rubyzip
- simple_form (2.0.1)
+ simple_form (2.0.2)
actionpack (~> 3.0)
activemodel (~> 3.0)
- spork (0.9.0)
- sprockets (2.1.2)
+ slop (2.4.4)
+ spork (0.9.1)
+ sprockets (2.1.3)
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
@@ -239,11 +251,11 @@ GEM
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
- tzinfo (0.3.32)
+ tzinfo (0.3.33)
uglifier (1.2.4)
execjs (>= 0.3.0)
multi_json (>= 1.0.2)
- unicorn (4.2.1)
+ unicorn (4.3.1)
kgio (~> 2.6)
rack
raindrops (~> 0.7)
@@ -276,10 +288,11 @@ DEPENDENCIES
jquery-rails
nokogiri
paper_trail
- paperclip (= 3.0.1)
+ paperclip (= 3.0.2)
pg (~> 0.13.2)
premailer
prototype-rails
+ pry-rails
rails (~> 3.2.2)
ransack!
responds_to_parent!
View
2  fat_free_crm.gemspec
@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
gem.add_dependency 'jquery-rails'
gem.add_dependency 'simple_form', '~> 2.0.1'
gem.add_dependency 'will_paginate', '~> 3.0.2'
- gem.add_dependency 'paperclip', '3.0.1'
+ gem.add_dependency 'paperclip', '3.0.2'
gem.add_dependency 'paper_trail'
gem.add_dependency 'authlogic', '~> 3.1.0'
gem.add_dependency 'acts_as_commentable', '~> 3.0.1'
Please sign in to comment.
Something went wrong with that request. Please try again.