From 2ec716edc69a9128077428d28e7075e8f24ef1bb Mon Sep 17 00:00:00 2001 From: scott Date: Thu, 8 Aug 2019 11:37:46 -0600 Subject: [PATCH 1/2] Update version, add new copyright notice --- app/themes/flat/views/layouts/_head.html.erb | 13 +++++++++++++ app/themes/light/views/layouts/_head.html.erb | 13 +++++++++++++ app/themes/nordic/views/layouts/_head.html.erb | 13 +++++++++++++ app/themes/singular/views/layouts/_head.html.erb | 13 +++++++++++++ app/views/layouts/_head.html.erb | 13 +++++++++++++ config/environment.rb | 2 +- 6 files changed, 66 insertions(+), 1 deletion(-) diff --git a/app/themes/flat/views/layouts/_head.html.erb b/app/themes/flat/views/layouts/_head.html.erb index c5977c5b2..d33723f9c 100644 --- a/app/themes/flat/views/layouts/_head.html.erb +++ b/app/themes/flat/views/layouts/_head.html.erb @@ -1,5 +1,18 @@ <%= content_for(:title) ? content_for(:title) : AppSettings['settings.site_name'] %> + diff --git a/app/themes/light/views/layouts/_head.html.erb b/app/themes/light/views/layouts/_head.html.erb index ff9bf5e35..8dc06dcd9 100644 --- a/app/themes/light/views/layouts/_head.html.erb +++ b/app/themes/light/views/layouts/_head.html.erb @@ -1,5 +1,18 @@ <%= content_for(:title) ? content_for(:title) : AppSettings['settings.site_name'] %> + diff --git a/app/themes/nordic/views/layouts/_head.html.erb b/app/themes/nordic/views/layouts/_head.html.erb index 8f01b7c54..0a0c86ec4 100644 --- a/app/themes/nordic/views/layouts/_head.html.erb +++ b/app/themes/nordic/views/layouts/_head.html.erb @@ -1,5 +1,18 @@ <%= content_for(:title) ? content_for(:title) : AppSettings['settings.site_name'] %> + diff --git a/app/themes/singular/views/layouts/_head.html.erb b/app/themes/singular/views/layouts/_head.html.erb index 87c0912cc..5c9c7d045 100644 --- a/app/themes/singular/views/layouts/_head.html.erb +++ b/app/themes/singular/views/layouts/_head.html.erb @@ -1,5 +1,18 @@ <%= content_for(:title) ? content_for(:title) : AppSettings['settings.site_name'] %> + diff --git a/app/views/layouts/_head.html.erb b/app/views/layouts/_head.html.erb index 3cb485c00..d508a8174 100644 --- a/app/views/layouts/_head.html.erb +++ b/app/views/layouts/_head.html.erb @@ -1,5 +1,18 @@ <%= content_for(:title) ? content_for(:title) : AppSettings['settings.site_name'] %> + diff --git a/config/environment.rb b/config/environment.rb index b414d2c68..056021f52 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -5,6 +5,6 @@ Rails.application.initialize! # Get the current tag version -VERSION = '2.5.0' +VERSION = '2.6.0' REVISION = `git log --pretty=format:'%h' -n 1` APP_VERSION = "#{VERSION}:#{REVISION}" From ee2983cb8d0bfdbe49ad64997bfdf08addf48cd0 Mon Sep 17 00:00:00 2001 From: scott Date: Tue, 20 Aug 2019 11:05:07 -0600 Subject: [PATCH 2/2] update updating.md --- UPDATING.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/UPDATING.md b/UPDATING.md index 2d7352ed9..91553825b 100644 --- a/UPDATING.md +++ b/UPDATING.md @@ -21,6 +21,15 @@ Whether you run the open source community edition or the cloud edition, start by 4. Restart the webserver. +### Helpy Pro Edition + +Helpy Pro is a packaged version, which greatly simplifies the process of updating. Note that updated versions typically are not avaiable to Pro until several days after the community edition release. Update using the apt package manager: + +1. `sudo apt-get update` +2. `sudo apt-get upgrade` +3. `sudo helpy run db:migrate` +4. `sudo helpy restart` + ### Cloud Edition If you are running the cloud edition, perform the following additional steps: