Skip to content

Commit

Permalink
Merge pull request #1 from bibendi/master
Browse files Browse the repository at this point in the history
Downgrade active record to >= 3.1.0
  • Loading branch information
bibendi committed Mar 31, 2015
2 parents 261075e + 4b6111f commit 31f5039
Show file tree
Hide file tree
Showing 6 changed files with 5 additions and 77 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,4 @@ rdoc
pkg

## PROJECT::SPECIFIC
Gemfile.lock
41 changes: 0 additions & 41 deletions Gemfile.lock

This file was deleted.

2 changes: 1 addition & 1 deletion postgresql_cursor.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
spec.require_paths = ["lib"]

#spec.add_dependency "pg" # Remove this for jruby, which should specify 'activerecord-jdbcpostgresql-adapter'
spec.add_dependency "activerecord", ">= 3.2.0"
spec.add_dependency "activerecord", ">= 3.1.0"

spec.add_development_dependency "pg"
spec.add_development_dependency "rake"
Expand Down
1 change: 1 addition & 0 deletions test-app/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Gemfile.lock
3 changes: 2 additions & 1 deletion test-app/Gemfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
# A sample Gemfile
source "https://rubygems.org"

gem 'activerecord', '~> 3.2.0'
gem 'activerecord', '~> 3.1.0'
#gem 'activerecord', '~> 3.2.0'
#gem 'activerecord', '~> 4.0.0'
#gem 'activerecord', '~> 4.1.0'
#gem 'activerecord', '4.1.2.rc1'
Expand Down
34 changes: 0 additions & 34 deletions test-app/Gemfile.lock

This file was deleted.

0 comments on commit 31f5039

Please sign in to comment.