Skip to content

Commit dd258c0

Browse files
authored
Merge pull request #1392 from scott/dev/2.6/prepare-2.6.0
Update version, add new copyright notice
2 parents d33f171 + 1395a09 commit dd258c0

File tree

7 files changed

+75
-1
lines changed

7 files changed

+75
-1
lines changed

UPDATING.md

+9
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,15 @@ Whether you run the open source community edition or the cloud edition, start by
2121

2222
4. Restart the webserver.
2323

24+
### Helpy Pro Edition
25+
26+
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:
27+
28+
1. `sudo apt-get update`
29+
2. `sudo apt-get upgrade`
30+
3. `sudo helpy run db:migrate`
31+
4. `sudo helpy restart`
32+
2433
### Cloud Edition
2534

2635
If you are running the cloud edition, perform the following additional steps:

app/themes/flat/views/layouts/_head.html.erb

+13
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
11
<!-- <title><%= @title_tag || AppSettings['settings.site_name'] %></title> -->
22
<title><%= content_for(:title) ? content_for(:title) : AppSettings['settings.site_name'] %></title>
3+
<!--
4+
HELPY VERSION: <%= APP_VERSION %>
5+
========================================
6+
Copyright (c) <%= Time.now.year %> Helpy.io, LLC, and Contributors.
7+
Full license at https://github.com/helpyio/helpy/blob/master/LICENSE
8+
9+
Note: If this install is running Helpy Cloud, Bot, Pro, Chat or other
10+
commercial or third party extensions those may be licensed differently.
11+
See https://support.helpy.io for more information.
12+
13+
REMOVAL OF THIS COPYRIGHT NOTICE IS EXPRESSLY PROHIBITED BY THE ABOVE
14+
REFERENCED LICENSE
15+
-->
316

417
<meta http-equiv="content-type" content="text/xhtml; charset=utf-8" />
518
<meta http-equiv="imagetoolbar" content="no" />

app/themes/light/views/layouts/_head.html.erb

+13
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
11
<!-- <title><%= @title_tag || AppSettings['settings.site_name'] %></title> -->
22
<title><%= content_for(:title) ? content_for(:title) : AppSettings['settings.site_name'] %></title>
3+
<!--
4+
HELPY VERSION: <%= APP_VERSION %>
5+
========================================
6+
Copyright (c) <%= Time.now.year %> Helpy.io, LLC, and Contributors.
7+
Full license at https://github.com/helpyio/helpy/blob/master/LICENSE
8+
9+
Note: If this install is running Helpy Cloud, Bot, Pro, Chat or other
10+
commercial or third party extensions those may be licensed differently.
11+
See https://support.helpy.io for more information.
12+
13+
REMOVAL OF THIS COPYRIGHT NOTICE IS EXPRESSLY PROHIBITED BY THE ABOVE
14+
REFERENCED LICENSE
15+
-->
316

417
<meta http-equiv="content-type" content="text/xhtml; charset=utf-8" />
518
<meta http-equiv="imagetoolbar" content="no" />

app/themes/nordic/views/layouts/_head.html.erb

+13
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
11
<!-- <title><%= @title_tag || AppSettings['settings.site_name'] %></title> -->
22
<title><%= content_for(:title) ? content_for(:title) : AppSettings['settings.site_name'] %></title>
3+
<!--
4+
HELPY VERSION: <%= APP_VERSION %>
5+
========================================
6+
Copyright (c) <%= Time.now.year %> Helpy.io, LLC, and Contributors.
7+
Full license at https://github.com/helpyio/helpy/blob/master/LICENSE
8+
9+
Note: If this install is running Helpy Cloud, Bot, Pro, Chat or other
10+
commercial or third party extensions those may be licensed differently.
11+
See https://support.helpy.io for more information.
12+
13+
REMOVAL OF THIS COPYRIGHT NOTICE IS EXPRESSLY PROHIBITED BY THE ABOVE
14+
REFERENCED LICENSE
15+
-->
316

417
<meta http-equiv="content-type" content="text/xhtml; charset=utf-8" />
518
<meta http-equiv="imagetoolbar" content="no" />

app/themes/singular/views/layouts/_head.html.erb

+13
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
11
<!-- <title><%= @title_tag || AppSettings['settings.site_name'] %></title> -->
22
<title><%= content_for(:title) ? content_for(:title) : AppSettings['settings.site_name'] %></title>
3+
<!--
4+
HELPY VERSION: <%= APP_VERSION %>
5+
========================================
6+
Copyright (c) <%= Time.now.year %> Helpy.io, LLC, and Contributors.
7+
Full license at https://github.com/helpyio/helpy/blob/master/LICENSE
8+
9+
Note: If this install is running Helpy Cloud, Bot, Pro, Chat or other
10+
commercial or third party extensions those may be licensed differently.
11+
See https://support.helpy.io for more information.
12+
13+
REMOVAL OF THIS COPYRIGHT NOTICE IS EXPRESSLY PROHIBITED BY THE ABOVE
14+
REFERENCED LICENSE
15+
-->
316

417
<meta http-equiv="content-type" content="text/xhtml; charset=utf-8" />
518
<meta http-equiv="imagetoolbar" content="no" />

app/views/layouts/_head.html.erb

+13
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
11
<!-- <title><%= @title_tag || AppSettings['settings.site_name'] %></title> -->
22
<title><%= content_for(:title) ? content_for(:title) : AppSettings['settings.site_name'] %></title>
3+
<!--
4+
HELPY VERSION: <%= APP_VERSION %>
5+
========================================
6+
Copyright (c) <%= Time.now.year %> Helpy.io, LLC, and Contributors.
7+
Full license at https://github.com/helpyio/helpy/blob/master/LICENSE
8+
9+
Note: If this install is running Helpy Cloud, Bot, Pro, Chat or other
10+
commercial or third party extensions those may be licensed differently.
11+
See https://support.helpy.io for more information.
12+
13+
REMOVAL OF THIS COPYRIGHT NOTICE IS EXPRESSLY PROHIBITED BY THE ABOVE
14+
REFERENCED LICENSE
15+
-->
316

417
<meta http-equiv="content-type" content="text/xhtml; charset=utf-8" />
518
<meta http-equiv="imagetoolbar" content="no" />

config/environment.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
Rails.application.initialize!
66

77
# Get the current tag version
8-
VERSION = '2.5.0'
8+
VERSION = '2.6.0'
99
REVISION = `git log --pretty=format:'%h' -n 1`
1010
APP_VERSION = "#{VERSION}:#{REVISION}"

0 commit comments

Comments
 (0)