Skip to content

Commit

Permalink
Gem updates, restrict pg gem until rails is updated
Browse files Browse the repository at this point in the history
  • Loading branch information
Arie committed Jan 14, 2018
1 parent 991f959 commit 9e888a5
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Expand Up @@ -52,7 +52,7 @@ gem 'american_date'
gem 'jbuilder'

gem 'ffi'
gem 'pg'
gem "pg", "~> 0.18"
gem 'therubyracer'
gem 'oily_png'

Expand Down
22 changes: 11 additions & 11 deletions Gemfile.lock
Expand Up @@ -74,7 +74,7 @@ GEM
sshkit (>= 1.6.1, != 1.7.0)
american_date (1.1.1)
arel (8.0.0)
autoprefixer-rails (7.2.4)
autoprefixer-rails (7.2.5)
execjs
backports (3.11.0)
base32_pure (0.1.0)
Expand All @@ -83,7 +83,7 @@ GEM
coderay (>= 1.0.0)
erubi (>= 1.0.0)
rack (>= 0.9.0)
binding_of_caller (0.7.3)
binding_of_caller (0.8.0)
debug_inspector (>= 0.0.1)
bootstrap-sass (3.3.7)
autoprefixer-rails (>= 5.2.1)
Expand Down Expand Up @@ -223,7 +223,7 @@ GEM
faraday (0.13.1)
multipart-post (>= 1.2, < 3)
ffi (1.9.18)
font-awesome-rails (4.7.0.2)
font-awesome-rails (4.7.0.3)
railties (>= 3.2, < 5.2)
fuubar (2.3.1)
rspec-core (~> 3.0)
Expand Down Expand Up @@ -254,10 +254,10 @@ GEM
launchy (2.4.3)
addressable (~> 2.3)
libv8 (3.16.14.19)
lograge (0.7.1)
actionpack (>= 4, < 5.2)
activesupport (>= 4, < 5.2)
railties (>= 4, < 5.2)
lograge (0.9.0)
actionpack (>= 4)
activesupport (>= 4)
railties (>= 4)
request_store (~> 1.0)
logs_tf (0.0.4)
faraday (~> 0.8)
Expand All @@ -283,8 +283,8 @@ GEM
mini_mime (1.0.0)
mini_portile2 (2.3.0)
minitest (5.11.1)
msgpack (1.2.0)
multi_json (1.12.2)
msgpack (1.2.2)
multi_json (1.13.1)
multi_test (0.1.2)
multi_xml (0.6.0)
multipart-post (2.0.0)
Expand Down Expand Up @@ -465,7 +465,7 @@ GEM
trollop (2.1.2)
tzinfo (1.2.4)
thread_safe (~> 0.1)
uglifier (4.1.2)
uglifier (4.1.3)
execjs (>= 0.3.0, < 3)
unf (0.1.4)
unf_ext
Expand Down Expand Up @@ -550,7 +550,7 @@ DEPENDENCIES
omniauth-openid
omniauth-steam
paypal-sdk-rest
pg
pg (~> 0.18)
pry-nav
puma
rack-attack
Expand Down

0 comments on commit 9e888a5

Please sign in to comment.