From 689850c55c2919aecdbdcbd48cc620b97d5a954b Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Fri, 20 Dec 2019 06:15:00 +0100
Subject: [PATCH] Update version, add changelog.

---
 .travis.yml        |  8 ++++----
 changelog.md       | 14 ++++++++++++++
 composer.json      |  2 +-
 composer.lock      | 12 ++++++------
 config/firefly.php |  2 +-
 5 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3426f09b9e..6e872a33d7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,21 +14,21 @@ jobs:
   include:
     - dist: xenial
       arch: amd64
-      env: ARCH=amd64 CHANNEL=stable VERSION=4.8.2
+      env: ARCH=amd64 CHANNEL=alpha VERSION=4.8.3-alpha.1
       stage: build
       script: ./.deploy/docker/travis.sh
     - dist: xenial
       arch: amd64
-      env: ARCH=arm CHANNEL=stable VERSION=4.8.2
+      env: ARCH=arm CHANNEL=alpha VERSION=4.8.3-alpha.1
       stage: build
       script: ./.deploy/docker/travis.sh
     - dist: xenial
       arch: arm64
-      env: ARCH=arm64 CHANNEL=stable VERSION=4.8.2
+      env: ARCH=arm64 CHANNEL=alpha VERSION=4.8.3-alpha.1
       stage: build
       script: ./.deploy/docker/travis.sh
     - dist: xenial
       arch: amd64
-      env: CHANNEL=stable VERSION=4.8.2
+      env: CHANNEL=alpha VERSION=4.8.3-alpha.1
       stage: manifest
       script: ./.deploy/docker/manifest.sh
\ No newline at end of file
diff --git a/changelog.md b/changelog.md
index b7dcf12641..71af2693bb 100644
--- a/changelog.md
+++ b/changelog.md
@@ -2,6 +2,20 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [4.8.3 (API 0.10.5)] - 20xx-xx-xx
+
+### 4.8.3-alpha.1
+- #2874
+- #2878
+- #2876
+- Firefly III now supports redis as cache backend.
+- Fine tune Docker container startup times using new environment variables.
+- #2895
+- #2881
+- Footer will warn you of alpha and beta versions.
+- #2901
+
+
 ## [4.8.2 (API 0.10.5)] - 2019-11-29
 
 After several alpha and beta versions (which were mainly released because I was
diff --git a/composer.json b/composer.json
index 59160ed8e8..0f68c36c67 100644
--- a/composer.json
+++ b/composer.json
@@ -75,7 +75,7 @@
     "davejamesmiller/laravel-breadcrumbs": "5.*",
     "doctrine/dbal": "2.*",
     "fideloper/proxy": "4.*",
-    "jc5/google2fa-laravel": "2.*",
+    "jc5/google2fa-laravel": "2.0.3",
     "laravel/framework": "5.8.*",
     "laravel/passport": "7.*",
     "laravelcollective/html": "5.8.*",
diff --git a/composer.lock b/composer.lock
index c7084b4107..1b06c6729e 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "aab8986d8f659600448665fe949d0c7c",
+    "content-hash": "1e3454ca8ca83a4e72686abb44c79d67",
     "packages": [
         {
             "name": "adldap2/adldap2",
@@ -1395,16 +1395,16 @@
         },
         {
             "name": "jc5/google2fa-laravel",
-            "version": "2.0.1",
+            "version": "2.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/JC5/google2fa-laravel.git",
-                "reference": "6839b1d50855fd9a4bbd5c3cbc2f939c33db3249"
+                "reference": "6d67f8cbe5f39d08c5b6522717764dcaf0ce6312"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/JC5/google2fa-laravel/zipball/6839b1d50855fd9a4bbd5c3cbc2f939c33db3249",
-                "reference": "6839b1d50855fd9a4bbd5c3cbc2f939c33db3249",
+                "url": "https://api.github.com/repos/JC5/google2fa-laravel/zipball/6d67f8cbe5f39d08c5b6522717764dcaf0ce6312",
+                "reference": "6d67f8cbe5f39d08c5b6522717764dcaf0ce6312",
                 "shasum": ""
             },
             "require": {
@@ -1468,7 +1468,7 @@
                 "google2fa",
                 "laravel"
             ],
-            "time": "2019-12-15T11:50:53+00:00"
+            "time": "2019-12-20T05:07:12+00:00"
         },
         {
             "name": "laravel/framework",
diff --git a/config/firefly.php b/config/firefly.php
index baadab6aed..c1df887329 100644
--- a/config/firefly.php
+++ b/config/firefly.php
@@ -125,7 +125,7 @@ return [
         'is_demo_site'     => false,
     ],
     'encryption'                   => null === env('USE_ENCRYPTION') || env('USE_ENCRYPTION') === true,
-    'version'                      => '4.8.2',
+    'version'                      => '4.8.3-alpha.1',
     'api_version'                  => '0.10.5',
     'db_version'                   => 11,
     'maxUploadSize'                => 15242880,