Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge pull request #1 from pmq20/master

The version of dependent Mongoid can be upgraded without changes to the main code
  • Loading branch information...
commit b950ee196c028864dcaf0217e3acf7cdb93e26b5 2 parents 28d36ff + 94db897
Lucas Souza authored
2  Gemfile
@@ -4,7 +4,7 @@ source "http://rubygems.org"
4 4 gemspec
5 5
6 6 group :development do
7   - gem "rails", "3.0.0"
  7 + gem "rails", "~> 3.1.3"
8 8 end
9 9
10 10 group :test do
4 spec/spec_helper.rb
@@ -2,10 +2,10 @@
2 2 require 'mongoid'
3 3 require 'will_paginate'
4 4 require 'will_paginate_mongoid'
5   -
6 5 require File.join(File.dirname(__FILE__), 'fake_app')
7 6 require 'rspec/rails'
8 7
  8 +
9 9 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
10 10
11 11 RSpec.configure do |config|
@@ -18,5 +18,5 @@
18 18 end
19 19
20 20 Mongoid.configure do |config|
21   - config.master = Mongo::Connection.new.db("will_paginate_mongoid")
  21 + config.master = Mongo::Connection.new.db("will_paginate_mongoid_test")
22 22 end
3  will_paginate_mongoid.gemspec
@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
18 18 s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
19 19 s.require_paths = ["lib"]
20 20
21   - s.add_runtime_dependency "mongoid", "~> 2.2.2"
  21 + s.add_runtime_dependency "mongoid", "~> 2.4"
  22 + s.add_runtime_dependency "bson_ext", "~> 1.5"
22 23 s.add_runtime_dependency "will_paginate", "~> 3.0.2"
23 24 end

0 comments on commit b950ee1

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