From 8421289e3bc9c105957eb3d35566c9977470a992 Mon Sep 17 00:00:00 2001
From: Dennis Schubert <mail@dennis-schubert.de>
Date: Tue, 28 Jun 2016 22:03:51 +0200
Subject: [PATCH 1/2] Re-add mysql2 to the Gemfile.lock

---
 Changelog.md | 4 ++++
 Gemfile.lock | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 87d178239..b78c946fa 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,7 @@
+# 0.5.10.1
+
+We made a mistake and removed `mysql2` from the `Gemfile.lock` in a recent gem update. Since this could cause some issues for some installations, we decided to release a hotfix.
+
 # 0.5.10.0
 
 ## Refactor
diff --git a/Gemfile.lock b/Gemfile.lock
index 1ab4062e8..b0e28698d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -474,6 +474,7 @@ GEM
     multi_test (0.1.2)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
+    mysql2 (0.4.4)
     naught (1.1.0)
     nenv (0.3.0)
     nested_form (0.3.2)
@@ -516,7 +517,6 @@ GEM
     orm_adapter (0.5.0)
     parser (2.3.1.2)
       ast (~> 2.2)
-    pg (0.18.4)
     phantomjs (2.1.1.0)
     pkg-config (1.1.7)
     powerpack (0.1.1)
@@ -846,6 +846,7 @@ DEPENDENCIES
   mini_magick (= 4.5.1)
   minitest
   mobile-fu (= 1.3.1)
+  mysql2 (= 0.4.4)
   nokogiri (= 1.6.8)
   omniauth (= 1.3.1)
   omniauth-facebook (= 3.0.0)
@@ -853,7 +854,6 @@ DEPENDENCIES
   omniauth-twitter (= 1.2.1)
   omniauth-wordpress (= 0.2.2)
   open_graph_reader (= 0.6.1)
-  pg (= 0.18.4)
   pry
   pry-byebug
   quiet_assets (= 1.1.0)

From 91bf63ec8acfabac589c9562544f487413cafb6e Mon Sep 17 00:00:00 2001
From: Dennis Schubert <mail@dennis-schubert.de>
Date: Tue, 28 Jun 2016 22:05:21 +0200
Subject: [PATCH 2/2] Release 0.5.10.1

---
 config/defaults.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/defaults.yml b/config/defaults.yml
index 7e3fde93c..f01e2dc49 100644
--- a/config/defaults.yml
+++ b/config/defaults.yml
@@ -4,7 +4,7 @@
 
 defaults:
   version:
-    number: "0.5.10.0" # Do not touch unless doing a release, do not backport the version number that's in master
+    number: "0.5.10.1" # Do not touch unless doing a release, do not backport the version number that's in master
   heroku: false
   environment:
     url: "http://localhost:3000/"