Skip to content
This repository has been archived by the owner on Sep 19, 2022. It is now read-only.

Commit

Permalink
Merge pull request #204 from sue445/feature/pg_v1
Browse files Browse the repository at this point in the history
Upgrade pg to v1.0.0
  • Loading branch information
sue445 committed Apr 1, 2018
2 parents 540c59e + bb4ebcd commit 130197a
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
5 changes: 2 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ ruby "2.5.1"
gem "rake"

# Component requirements
gem "activerecord", require: "active_record"
gem "activerecord", ">= 5.1.5", require: "active_record"
gem "sass"
gem "slim"

Expand Down Expand Up @@ -62,6 +62,5 @@ group :test do
end

group :production do
# TODO: Remove version lock when activerecord v5.1.5+ is released
gem "pg", "< 1.0.0", group: :test
gem "pg", ">= 1.0.0", group: :test
end
9 changes: 6 additions & 3 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ GEM
hashery (~> 2.0)
ruby-rc4
ttfunk
pg (0.21.0)
pg (1.0.0)
powerpack (0.1.1)
pry (0.11.3)
coderay (~> 1.1.0)
Expand Down Expand Up @@ -240,7 +240,7 @@ PLATFORMS
ruby

DEPENDENCIES
activerecord
activerecord (>= 5.1.5)
activerecord-simple_index_name
annotate
coveralls
Expand All @@ -253,7 +253,7 @@ DEPENDENCIES
onkcop
padrino
pdf-reader
pg (< 1.0.0)
pg (>= 1.0.0)
pry-byebug
puma
puma-heroku
Expand All @@ -268,5 +268,8 @@ DEPENDENCIES
sqlite3
twitter

RUBY VERSION
ruby 2.5.1p57

BUNDLED WITH
1.16.1

0 comments on commit 130197a

Please sign in to comment.