Permalink
Browse files

Freeze Paperclip's version to 2.x because of incompatibility with jru…

…by-18mode
  • Loading branch information...
1 parent c6866b1 commit d5de040576d33b91192f3af40a309f55e6b6ddf5 @mshibuya mshibuya committed Mar 27, 2012
View
@@ -28,7 +28,7 @@ group :active_record do
gem 'sqlite3', '~> 1.3'
end
end
- gem 'paperclip'
+ gem 'paperclip', '~>2.4'
gem 'carrierwave'
gem 'dragonfly'
end
@@ -37,6 +37,7 @@ group :mongoid do
gem 'bson_ext'
gem 'mongoid'
gem 'mongoid-paperclip', :require => 'mongoid_paperclip'
+ gem 'paperclip', '~>2.4'
gem 'carrierwave-mongoid', :require => 'carrierwave/mongoid'
gem 'dragonfly'
end
@@ -55,6 +56,10 @@ group :debug do
gem 'ruby-debug19'
gem 'simplecov', :require => false
end
+
+ platform :jruby do
+ gem 'ruby-debug'
+ end
end
platforms :jruby, :mingw_18, :ruby_18 do
View
@@ -31,7 +31,7 @@ group :active_record do
gem 'sqlite3', '~> 1.3'
end
end
- gem 'paperclip'
+ gem 'paperclip', '~>2.4'
gem 'carrierwave'
gem 'dragonfly'
end
@@ -40,6 +40,7 @@ group :mongoid do
gem 'bson_ext'
gem 'mongoid'
gem 'mongoid-paperclip', :require => 'mongoid_paperclip'
+ gem 'paperclip', '~>2.4'
gem 'carrierwave-mongoid', :require => 'carrierwave/mongoid'
gem 'dragonfly'
end
View
@@ -24,7 +24,6 @@ Gem::Specification.new do |gem|
gem.add_development_dependency 'generator_spec'
gem.add_development_dependency 'launchy'
gem.add_development_dependency 'mini_magick'
- gem.add_development_dependency 'paperclip'
gem.add_development_dependency 'rspec-rails'
gem.add_development_dependency 'timecop'
gem.authors = ["Erik Michaels-Ober", "Bogdan Gaza", "Petteri Kaapa", "Benoit Benezech"]
View
@@ -37,6 +37,7 @@ group :mongoid do
gem 'bson_ext'
gem 'mongoid'
gem 'mongoid-paperclip', :require => 'mongoid_paperclip'
+ gem 'paperclip', '~> 2.4'
gem 'carrierwave-mongoid', :require => 'carrierwave/mongoid'
gem 'dragonfly'
end
@@ -1,4 +1,5 @@
require 'rails_admin/extensions/history/history'
+require 'rails_admin/adapters/active_record'
DatabaseCleaner.strategy = :transaction
View
@@ -1,3 +1,5 @@
+require 'rails_admin/adapters/mongoid'
+
class Tableless
include Mongoid::Document
@@ -39,6 +39,7 @@
describe "a record with protected attributes and has_one association" do
let(:draft) { Factory :draft }
+ let(:number) { draft.player.number + 1 } # to avoid collision
before do
object.set_attributes({ :name => name, :number => number, :position => position, :suspended => suspended, :team_id => nil, :draft_id => draft.id })

0 comments on commit d5de040

Please sign in to comment.