From 3b7308dccd088e2352edd3f32720b059c12eb4dc Mon Sep 17 00:00:00 2001
From: James Brooks <jbrooksuk@me.com>
Date: Wed, 4 Nov 2015 15:07:58 +0000
Subject: [PATCH 1/3] Display the current version in the settings sidebar.
 Closes #1061

---
 VERSION                                               | 1 +
 app/Http/Controllers/Dashboard/SettingsController.php | 6 ++++++
 app/Providers/AppServiceProvider.php                  | 2 ++
 3 files changed, 9 insertions(+)
 create mode 100644 VERSION

diff --git a/VERSION b/VERSION
new file mode 100644
index 00000000..54ef5dd1
--- /dev/null
+++ b/VERSION
@@ -0,0 +1 @@
+2.0.0-RC1
diff --git a/app/Http/Controllers/Dashboard/SettingsController.php b/app/Http/Controllers/Dashboard/SettingsController.php
index 4c4014a6..8feb9be6 100644
--- a/app/Http/Controllers/Dashboard/SettingsController.php
+++ b/app/Http/Controllers/Dashboard/SettingsController.php
@@ -81,6 +81,12 @@ class SettingsController extends Controller
                 'icon'   => 'ion-paintbucket',
                 'active' => false,
             ],
+            'about' => [
+                'title'  => CACHET_VERSION,
+                'url'    => 'javascript: void(0);',
+                'icon'   => 'ion-flag',
+                'active' => false,
+            ],
         ];
 
         View::share([
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index 61a874ac..0355e450 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -28,6 +28,8 @@ class AppServiceProvider extends ServiceProvider
             return Dispatcher::simpleMapping($command, 'CachetHQ\Cachet', 'CachetHQ\Cachet\Handlers');
         });
 
+        define('CACHET_VERSION', trim(file_get_contents($this->app->basePath().'/VERSION')));
+
         Str::macro('canonicalize', function ($url) {
             return preg_replace('/([^\/])$/', '$1/', $url);
         });

From b8fa1f0111b280248dd98ffeb316fcb88240c589 Mon Sep 17 00:00:00 2001
From: Graham Campbell <graham@alt-three.com>
Date: Wed, 4 Nov 2015 17:39:16 +0000
Subject: [PATCH 2/3] Moved the defining to the autoload.php file

---
 app/Providers/AppServiceProvider.php | 2 --
 bootstrap/autoload.php               | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index 0355e450..61a874ac 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -28,8 +28,6 @@ class AppServiceProvider extends ServiceProvider
             return Dispatcher::simpleMapping($command, 'CachetHQ\Cachet', 'CachetHQ\Cachet\Handlers');
         });
 
-        define('CACHET_VERSION', trim(file_get_contents($this->app->basePath().'/VERSION')));
-
         Str::macro('canonicalize', function ($url) {
             return preg_replace('/([^\/])$/', '$1/', $url);
         });
diff --git a/bootstrap/autoload.php b/bootstrap/autoload.php
index 467116a6..9a75f039 100644
--- a/bootstrap/autoload.php
+++ b/bootstrap/autoload.php
@@ -11,6 +11,8 @@
 
 define('LARAVEL_START', microtime(true));
 
+define('CACHET_VERSION', trim(file_get_contents(__DIR__.'/../VERSION')));
+
 /*
 |--------------------------------------------------------------------------
 | Register The Composer Auto Loader

From 4775ef43b75c0f41f23e430160e8cdf52bef656d Mon Sep 17 00:00:00 2001
From: Graham Campbell <graham@alt-three.com>
Date: Wed, 4 Nov 2015 17:39:55 +0000
Subject: [PATCH 3/3] Fixed the version constant

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index 54ef5dd1..d72f2626 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.0.0-RC1
+2.0.0-dev