broken gemfile.lock and pass recent migrations

This commit is contained in:
Connor Turland 2016-01-22 16:14:35 +13:00
parent 4557b8e305
commit 5d838303a8
2 changed files with 4 additions and 4 deletions

View file

@ -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

View file

@ -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"