Skip to content

Commit

Permalink
Revert "Update Pg and MySQL2 gems in Bundle"
Browse files Browse the repository at this point in the history
This reverts commit fb3edd3953ffc019ffdc21a366c734c43ca44271.
  • Loading branch information
Bodacious committed Sep 11, 2018
1 parent cf70ae4 commit d51fd87
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ gem 'responders', '~> 2.0'
# A simple, fast Mysql library for Ruby, binding to libmysql
# (http://github.com/brianmario/mysql2)
# A simple, fast Mysql library for Ruby, binding to libmysql (http://github.com/brianmario/mysql2)
gem 'mysql2'
gem 'mysql2', '~> 0.4.10'

# Pg is the Ruby interface to the {PostgreSQL
# RDBMS}[http://www.postgresql.org/](https://bitbucket.org/ged/ruby-pg)
# Pg is the Ruby interface to the {PostgreSQL RDBMS}[http://www.postgresql.org/] (https://bitbucket.org/ged/ruby-pg)
gem 'pg'
gem 'pg', '~> 0.19.0'

# Bit fields for ActiveRecord (https://github.com/pboling/flag_shih_tzu)
gem 'flag_shih_tzu' # Allows for bitfields in activereccord
Expand Down
8 changes: 4 additions & 4 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ GEM
multi_json (1.13.1)
multi_xml (0.6.0)
multipart-post (2.0.0)
mysql2 (0.5.2)
mysql2 (0.4.10)
nenv (0.3.0)
nokogiri (1.8.4)
mini_portile2 (~> 2.3.0)
Expand Down Expand Up @@ -249,7 +249,7 @@ GEM
parallel (1.12.1)
parser (2.5.1.2)
ast (~> 2.4.0)
pg (1.1.3)
pg (0.19.0)
po_to_json (1.0.1)
json (>= 1.6.0)
powerpack (0.1.2)
Expand Down Expand Up @@ -471,11 +471,11 @@ DEPENDENCIES
ledermann-rails-settings
mini_racer
mocha
mysql2
mysql2 (~> 0.4.10)
omniauth
omniauth-orcid
omniauth-shibboleth
pg
pg (~> 0.19.0)
progress_bar
pundit
rack-mini-profiler
Expand Down

0 comments on commit d51fd87

Please sign in to comment.