Merge pull request #2466 from TracksApp/2.5.0

Version 2.5.0

Dockerfile

@@ -11,6 +11,10 @@ COPY Gemfile* /app/
 RUN gem install bundler
 RUN bundle install --jobs 4
 
+RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
+RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
+RUN apt-get update && apt-get install -y yarn
+
 RUN mkdir /app/log
 
 COPY . /app/

README.md

@@ -1,5 +1,8 @@
 # Tracks: a GTD(TM) web application, built with Ruby on Rails
 
+[![Build Status](https://github.com/TracksApp/tracks/workflows/Continuous%20Integration/badge.svg)](https://github.com/TracksApp/tracks/actions)
+[![Code Climate](https://codeclimate.com/github/TracksApp/tracks/badges/gpa.svg)](https://codeclimate.com/github/TracksApp/tracks)
+
 * Project homepage: http://www.getontracks.org/
 * Manual: http://www.getontracks.org/manual/
 * Source at GitHub: https://github.com/TracksApp/tracks
@@ -13,18 +16,14 @@
 * Contributors: https://github.com/TracksApp/tracks/wiki/Contributors
 * License: See COPYING
 
-[![Build Status](https://github.com/TracksApp/tracks/workflows/Continuous%20Integration/badge.svg)](https://github.com/TracksApp/tracks/actions)
-[![Code Climate](https://codeclimate.com/github/TracksApp/tracks/badges/gpa.svg)](https://codeclimate.com/github/TracksApp/tracks)
-
 Full instructions for both new installations and upgrades from older installations
 of Tracks can be found in the [wiki](https://github.com/TracksApp/tracks/wiki/Installation).
 
 If you are thinking about contributing towards the development of Tracks,
 please read /CONTRIBUTING.md for general information. Also you can find
 some information on development, testing and contributing on the wiki.
 
-While fully usable for everyday use, Tracks is still a work in progress. Make
-sure that you take sensible precautions and back up all your data frequently,
+As always, make sure that you take sensible precautions and back up all your data frequently,
 taking particular care when you are upgrading.
 
 Enjoy being productive!

app/assets/stylesheets/black.scss

@@ -1,3 +1,15 @@
+/*
+ * Apparently the requires need to be in the "root" stylesheet file, not
+ * the imported manifest.
+ *
+ *= require jquery-ui/menu
+ *= require jquery-ui/autocomplete
+ *= require jquery-ui/datepicker
+ *= require jquery-ui/dialog
+ *= require jquery-ui/sortable
+ *= require_self
+ */
+
 $gray-lighter: #EEE;
 $brand-primary: rgba(0, 0, 0, 0.75);
 $navbar-inverse-bg: $brand_primary;

app/assets/stylesheets/include/manifest.scss

@@ -9,13 +9,6 @@
  * compiled file so the styles you add here take precedence over styles defined in any styles
  * defined in the other CSS/SCSS files in this directory. It is generally better to create a new
  * file per style scope.
- *
- *= require jquery-ui/menu
- *= require jquery-ui/autocomplete
- *= require jquery-ui/datepicker
- *= require jquery-ui/dialog
- *= require jquery-ui/sortable
- *= require_self
  */
 
 @import "icons";

app/assets/stylesheets/light_blue.scss

@@ -1,3 +1,15 @@
+/*
+ * Apparently the requires need to be in the "root" stylesheet file, not
+ * the imported manifest.
+ *
+ *= require jquery-ui/menu
+ *= require jquery-ui/autocomplete
+ *= require jquery-ui/datepicker
+ *= require jquery-ui/dialog
+ *= require jquery-ui/sortable
+ *= require_self
+ */
+
 $gray-lighter: lighten(#000, 93.5%);
 $brand-primary: #3C6997;
 $navbar-inverse-bg: $brand_primary;

config/initializers/tracks.rb

@@ -1,4 +1,4 @@
-tracks_version='2.4.2'
+tracks_version='2.5.0'
 # comment out next two lines if you do not want (or can not) the date of the
 # last git commit in the footer
 info=`git log --pretty=format:"%ai" -1`

doc/CHANGELOG.md

@@ -1,3 +1,28 @@
+## Version 2.5.0
+
+See doc/upgrading.md for the upgrade documentation!
+
+### New features
+* Updated documentation both in the doc directory and online.
+* .skip-docker file has been replaced with .use-docker, see upgrading.md for
+  details.
+* Added email, last login, creation and update time to the user model.
+* Added terms of service and email fields to the signup form. The TOS link is
+  defined in site.yml, see config/site.yml.tmpl.
+* New, lighter default color scheme. The black color scheme is also available
+  for selection in the user preferences. Default theme can be set in site.yml.
+* Added a help page to the ? menu linking to online help assets.
+* Allow the user to remove their own account.
+
+### Removed features
+* Ruby versions below 2.5 are no longer supported.
+* Old Internet Explorer versions (7 and 8) are no longer supported.
+
+### Bug fixes
+* Fixed the signup form to use login form styles.
+* Lots of dependencies have been upgraded, including Rails major upgrade.
+* Fixed some minor UI bugs.
+
 ## Version 2.4.2
 
 ### New features

doc/upgrading.md

@@ -1,5 +1,26 @@
 # Upgrading Tracks
-## Upgrading from Tracks 2.4.2 to 2.5
+
+## General upgrade instructions
+
+* Remember to always backup your database before upgrading! Test before
+  upgrading production environments.
+
+* For information regarding installation see doc/installation.md.
+
+* Make sure to run database migrations using one one of the following:
+```
+   # For pure (Dockerless) installation:
+   $ rake db:migrate
+
+   # For Docker Compose installation:
+   $ bin/rake db:migrate
+
+   # For separate Docker container installation either one of:
+   $ docker run --link mariadb:db --rm -t tracks bin/rake db:migrate
+   $ docker run --link postgres:db --rm -t tracks bin/rake db:migrate
+```
+
+## Upgrading from Tracks 2.4.2 to 2.5.0
 
 * If you're using the Docker Compose environment and want to run the commands in
   the bin/ directory inside the container from the host system, add a .use-docker