Skip to content

Commit

Permalink
Merge pull request #21 from jeremyyap/master
Browse files Browse the repository at this point in the history
Limit pg gem version to < 1 for older Rails versions
  • Loading branch information
ronen committed Feb 4, 2018
2 parents 40e1557 + 0eb7f5f commit de52e6e
Show file tree
Hide file tree
Showing 15 changed files with 27 additions and 27 deletions.
2 changes: 1 addition & 1 deletion templates/gemfiles/activerecord-3.2/Gemfile.postgresql.erb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ require "pathname"
eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)

platform :ruby do
gem "pg"
gem "pg", "< 1"
end

platform :jruby do
Expand Down
2 changes: 1 addition & 1 deletion templates/gemfiles/activerecord-4.0/Gemfile.postgresql.erb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ require "pathname"
eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)

platform :ruby do
gem "pg"
gem "pg", "< 1"
end

platform :jruby do
Expand Down
2 changes: 1 addition & 1 deletion templates/gemfiles/activerecord-4.1/Gemfile.postgresql.erb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ require "pathname"
eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)

platform :ruby do
gem "pg"
gem "pg", "< 1"
end

platform :jruby do
Expand Down
4 changes: 2 additions & 2 deletions templates/gemfiles/activerecord-4.2.0/Gemfile.postgresql.erb
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ require "pathname"
eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)

platform :ruby do
gem "pg"
gem "pg", "< 1"
end

platform :jruby do
gem 'activerecord-jdbcpostgresql-adapter'
end
end
4 changes: 2 additions & 2 deletions templates/gemfiles/activerecord-4.2.1/Gemfile.postgresql.erb
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ require "pathname"
eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)

platform :ruby do
gem "pg"
gem "pg", "< 1"
end

platform :jruby do
gem 'activerecord-jdbcpostgresql-adapter'
end
end
4 changes: 2 additions & 2 deletions templates/gemfiles/activerecord-4.2.6/Gemfile.postgresql.erb
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ require "pathname"
eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)

platform :ruby do
gem "pg"
gem "pg", "< 1"
end

platform :jruby do
gem 'activerecord-jdbcpostgresql-adapter'
end
end
4 changes: 2 additions & 2 deletions templates/gemfiles/activerecord-4.2/Gemfile.postgresql.erb
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ require "pathname"
eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)

platform :ruby do
gem "pg"
gem "pg", "< 1"
end

platform :jruby do
gem 'activerecord-jdbcpostgresql-adapter'
end
end
4 changes: 2 additions & 2 deletions templates/gemfiles/activerecord-5.0.0/Gemfile.postgresql.erb
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ require "pathname"
eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)

platform :ruby do
gem "pg"
gem "pg", "< 1"
end

platform :jruby do
gem 'activerecord-jdbcpostgresql-adapter'
end
end
4 changes: 2 additions & 2 deletions templates/gemfiles/activerecord-5.0.1/Gemfile.postgresql.erb
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ require "pathname"
eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)

platform :ruby do
gem "pg"
gem "pg", "< 1"
end

platform :jruby do
gem 'activerecord-jdbcpostgresql-adapter'
end
end
4 changes: 2 additions & 2 deletions templates/gemfiles/activerecord-5.0.2/Gemfile.postgresql.erb
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ require "pathname"
eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)

platform :ruby do
gem "pg"
gem "pg", "< 1"
end

platform :jruby do
gem 'activerecord-jdbcpostgresql-adapter'
end
end
4 changes: 2 additions & 2 deletions templates/gemfiles/activerecord-5.0.3/Gemfile.postgresql.erb
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ require "pathname"
eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)

platform :ruby do
gem "pg"
gem "pg", "< 1"
end

platform :jruby do
gem 'activerecord-jdbcpostgresql-adapter'
end
end
4 changes: 2 additions & 2 deletions templates/gemfiles/activerecord-5.0/Gemfile.postgresql.erb
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ require "pathname"
eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)

platform :ruby do
gem "pg"
gem "pg", "< 1"
end

platform :jruby do
gem 'activerecord-jdbcpostgresql-adapter'
end
end
4 changes: 2 additions & 2 deletions templates/gemfiles/activerecord-5.1.0/Gemfile.postgresql.erb
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ require "pathname"
eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)

platform :ruby do
gem "pg"
gem "pg", "< 1"
end

platform :jruby do
gem 'activerecord-jdbcpostgresql-adapter'
end
end
4 changes: 2 additions & 2 deletions templates/gemfiles/activerecord-5.1.1/Gemfile.postgresql.erb
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ require "pathname"
eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)

platform :ruby do
gem "pg"
gem "pg", "< 1"
end

platform :jruby do
gem 'activerecord-jdbcpostgresql-adapter'
end
end
4 changes: 2 additions & 2 deletions templates/gemfiles/activerecord-5.1/Gemfile.postgresql.erb
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ require "pathname"
eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)

platform :ruby do
gem "pg"
gem "pg", "< 1"
end

platform :jruby do
gem 'activerecord-jdbcpostgresql-adapter'
end
end

0 comments on commit de52e6e

Please sign in to comment.