From f2d381398617aacfa5f045ca8c023aacefb4e5d2 Mon Sep 17 00:00:00 2001
From: evris99 <cptevris@gmail.com>
Date: Thu, 16 Nov 2017 18:34:47 +0200
Subject: [PATCH 1/3] Changed db:migrate to db:schema:load

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 6650fbf9..88c50189 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,7 +22,7 @@ before_script:
   - cp config/database.yml.travis config/database.yml
   - cp config/secrets.yml.example config/secrets.yml
   - mysql -u root -e 'create database osem_test;'
-  - RAILS_ENV=test bundle exec rake db:migrate --trace
+  - RAILS_ENV=test bundle exec rake db:schema:load --trace
 script:
   - "./travis_script.sh $TEST_SUITE"
 env:

From e32837b3b1af3bb03da04e2dbc05271ccf99a5aa Mon Sep 17 00:00:00 2001
From: Naman Gupta <01namangupta@gmail.com>
Date: Fri, 17 Nov 2017 00:41:20 +0530
Subject: [PATCH 2/3] schema is added

---
 db/schema.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/db/schema.rb b/db/schema.rb
index bdf3ad65..ea1e3dd7 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -505,7 +505,7 @@ ActiveRecord::Schema.define(version: 20170924190528) do
     t.integer  "user_id"
     t.integer  "payment_id"
     t.integer  "week"
-    t.float    "amount_paid"
+    t.float    "amount_paid",   default: 0.0
   end
 
   create_table "ticket_scannings", force: :cascade do |t|
@@ -579,7 +579,6 @@ ActiveRecord::Schema.define(version: 20170924190528) do
     t.boolean  "is_admin",               default: false
     t.string   "username"
     t.boolean  "is_disabled",            default: false
-    t.string   "token"
   end
 
   add_index "users", ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true

From 9885b3617f249cf5df4b8212d479e1fb0f3a50ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ana=20Mar=C3=ADa=20Mart=C3=ADnez=20G=C3=B3mez?=
 <ammartinez@suse.de>
Date: Fri, 17 Nov 2017 10:07:02 +0100
Subject: [PATCH 3/3] Update yajl-ruby to 1.3.1

There is a security vulnerability in yajl-ruby 1.3.0:

In the yajl-ruby gem 1.3.0 for Ruby, when a crafted JSON file is
supplied to `Yajl::Parser.new.parse`, the whole ruby process crashes
with a `SIGABRT` in the `yajl_string_decode` function in
`yajl_encode.c`. This results in the whole ruby process terminating and
potentially a denial of service.

Reference:

https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-16516
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index bad063c8..cdc4e0cb 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -555,7 +555,7 @@ GEM
       chronic (>= 0.6.3)
     xpath (2.0.0)
       nokogiri (~> 1.3)
-    yajl-ruby (1.3.0)
+    yajl-ruby (1.3.1)
 
 PLATFORMS
   ruby
@@ -668,4 +668,4 @@ DEPENDENCIES
   whenever
 
 BUNDLED WITH
-   1.15.4
+   1.16.0