Skip to content

AO3-4427 Update mysql2 as far as rails will allow #2292

Merged
merged 3 commits into from May 25, 2016

4 participants

@zz9pzza
zz9pzza commented Jan 10, 2016

I think if this loads its probably ok

https://otwarchive.atlassian.net/browse/AO3-4427

@zz9pzza zz9pzza added the Gem Updates label Jan 10, 2016
@elzj elzj commented on the diff Jan 16, 2016
Gemfile.lock
@@ -172,7 +172,8 @@ GEM
multi_test (0.1.2)
multi_xml (0.5.5)
multipart-post (2.0.0)
- mysql2 (0.3.10)
+ mysql2 (0.3.20)
+ mysql2 (0.3.20-x86-mingw32)
@elzj
Organization for Transformative Works member
elzj added a note Jan 16, 2016

Should this have two entries?

@zz9pzza
zz9pzza added a note Jan 17, 2016

I just run the command to update the gem, It is not the only thing with two entries.

Does it need two, I expect not but I don't want to edit the Gemfile.lock file by hand as that seems wrong.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
@sarken
Organization for Transformative Works member
sarken commented Mar 2, 2016

Alas! Merge conflicts.

@shalott shalott changed the title from Ao3-4427 Update mysql2 as far as rails will allow to AO3-4427 Update mysql2 as far as rails will allow Apr 10, 2016
@shalott
Organization for Transformative Works member
shalott commented Apr 10, 2016

If there were a problem with this I can't imagine our tests wouldn't bomb so I am confident in using it.

@zz9pzza zz9pzza merged commit 05535ee into otwcode:master May 25, 2016

1 check passed

Details continuous-integration/travis-ci/pr The Travis CI build passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Something went wrong with that request. Please try again.