From cd0fa12562f61ecb7d9d8506c4f7c2488a0e094b Mon Sep 17 00:00:00 2001
From: Sam <sam.saffron@gmail.com>
Date: Fri, 13 Feb 2015 10:10:15 +1100
Subject: [PATCH 1/2] FIX: downgrade pg to stop memory leak

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

diff --git a/Gemfile b/Gemfile
index 1726d715cd..3226853c6b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -145,7 +145,10 @@ gem 'omniauth-github-discourse', require: 'omniauth-github'
 gem 'omniauth-oauth2', require: false
 gem 'omniauth-google-oauth2'
 gem 'oj'
-gem 'pg'
+# pg is downgraded while we investigate a severe memory issu
+#  during multi threading that shows up on 0.18.1
+# This also means we DO NOT work on Ruby 2.2 at the moment
+gem 'pg', '0.15.1'
 gem 'pry-rails', require: false
 gem 'rake'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 4b60ab50aa..a47b8f3832 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -282,7 +282,7 @@ GEM
     openid-redis-store (0.0.2)
       redis
       ruby-openid
-    pg (0.18.1)
+    pg (0.15.1)
     polyglot (0.3.5)
     progress (3.0.1)
     pry (0.10.1)
@@ -508,7 +508,7 @@ DEPENDENCIES
   omniauth-twitter
   onebox
   openid-redis-store
-  pg
+  pg (= 0.15.1)
   pry-nav
   pry-rails
   puma

From f62c0db162e9d8bd9385211b2ef515528c13215e Mon Sep 17 00:00:00 2001
From: Neil Lalonde <neillalonde@gmail.com>
Date: Thu, 12 Feb 2015 18:30:43 -0500
Subject: [PATCH 2/2] Version bump to v1.2.0.beta8

---
 lib/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/version.rb b/lib/version.rb
index c17dc6ec1e..f2a2db1731 100644
--- a/lib/version.rb
+++ b/lib/version.rb
@@ -5,7 +5,7 @@ module Discourse
       MAJOR = 1
       MINOR = 2
       TINY  = 0
-      PRE   = 'beta7'
+      PRE   = 'beta8'
 
       STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
     end