From 5d838303a88da1b4386b4826e1d6fe2acb99efb0 Mon Sep 17 00:00:00 2001
From: Connor Turland <connorturland@gmail.com>
Date: Fri, 22 Jan 2016 16:14:35 +1300
Subject: [PATCH] broken gemfile.lock and pass recent migrations

---
 Gemfile.lock | 6 +++---
 db/schema.rb | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 4e82a050..be8637de 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -68,7 +68,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.10.0)
-    concurrent-ruby (1.0.0)
+    columnize (0.9.0)
     debug_inspector (0.0.2)
     devise (3.5.2)
       bcrypt (~> 3.0)
@@ -114,7 +114,7 @@ GEM
     method_source (0.8.2)
     mime-types (2.6.2)
     mimemagic (0.3.0)
-    mini_portile (0.6.2)
+    mini_portile2 (2.0.0)
     minitest (5.8.2)
     multi_json (1.11.2)
     nokogiri (1.6.7)
@@ -263,4 +263,4 @@ DEPENDENCIES
   uservoice-ruby
 
 BUNDLED WITH
-   1.10.6
+   1.11.2
diff --git a/db/schema.rb b/db/schema.rb
index e614b129..4d11bfea 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20151028061513) do
+ActiveRecord::Schema.define(version: 20160120061513) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"