Skip to content

Commit

Permalink
Upgrade mysql2 gem now that we're on rails 5
Browse files Browse the repository at this point in the history
  • Loading branch information
mlandauer committed Jul 28, 2022
1 parent 6625981 commit 361972b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
6 changes: 4 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,8 @@ gem "dotenv-rails", "< 2.8.0"
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem "rails", "5.0.7.2"

gem "mysql2"
gem "sqlite3"
# The very latest mysql2 gem versions only work with rails 5
gem "mysql2", "~> 0.4.10"

gem "bootstrap-sass"
gem "bootstrap-select-rails"
Expand Down Expand Up @@ -59,6 +58,9 @@ gem "cancan"
gem "d3-rails", "~> 3.5"
# Locking elasticsearch to 7.5.0 as upgrading it seems to break things working
# with the ancient version of elasticsearch (1.x) that we're running currently
# This lock is also stopping us from upgrading faraday which is giving us
# deprecation warnings.
# TODO: Upgrade elasticsearch as soon as we can
gem "elasticsearch", "7.5.0"
gem "haml-coderay"
gem "honeybadger"
Expand Down
4 changes: 2 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ GEM
multipart-post (2.2.3)
mustermann (2.0.2)
ruby2_keywords (~> 0.0.1)
mysql2 (0.4.10)
mysql2 (0.5.4)
nenv (0.3.0)
net-scp (3.0.0)
net-ssh (>= 2.6.5, < 7.0.0)
Expand Down Expand Up @@ -638,7 +638,7 @@ DEPENDENCIES
memory_profiler
meta-tags
multiblock
mysql2 (~> 0.4.10)
mysql2
nio4r (~> 2.4.0)
nokogiri
octokit (~> 4.0)
Expand Down

0 comments on commit 361972b

Please sign in to comment.