Merge branch 'master' of github.com:codebar/planner

.github/workflows/ruby.yml

@@ -24,7 +24,7 @@ jobs:
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.5.9
+        ruby-version: 2.7.2
         bundler-cache: true
       env:
         BUNDLE_JOBS: 4

.gitignore

@@ -14,6 +14,21 @@
 # Ignore all logfiles and tempfiles.
 /log/*.log
 /tmp
+!/tmp/.keep
+
+# Ignore uploaded files in development
+/storage/*
+!/storage/.keep
+
+/node_modules
+/yarn-error.log
+
+/public/assets
+.byebug_history
+
+# Ignore master key for decrypting credentials and more.
+/config/master.key
+
 /coverage/
 
 TAGS

.ruby-version

@@ -1 +1 @@
-2.5.9
+2.7.2

Dockerfile

@@ -1,8 +1,8 @@
-FROM ruby:2.5.9
+FROM ruby:2.7.2
 
 # Default node version on apt is old. This makes sure a recent version is installed
 # This step also runs apt-get update
-RUN curl -sL https://deb.nodesource.com/setup_12.x | bash -
+RUN curl -fsSL https://deb.nodesource.com/setup_20.x | bash -
 RUN apt-get install -y --force-yes build-essential libpq-dev nodejs
 
 # Install latest chrome dev package
@@ -17,6 +17,6 @@ RUN set -ex; \
 WORKDIR /planner
 
 COPY Gemfile Gemfile.lock ./
-RUN bundle install
+RUN bundle install --jobs 4
 
 COPY . ./

Gemfile

@@ -1,39 +1,42 @@
 source 'https://rubygems.org'
-ruby '2.5.9'
+ruby '2.7.2'
 
-gem 'rails', '4.2.11.3'
+gem 'rails', '5.2.8.1'
+# Reduces boot times through caching; required in config/boot.rb
+gem 'bootsnap', '>= 1.1.0', require: false
 
-gem 'acts-as-taggable-on', '~> 5.0'
+gem 'acts-as-taggable-on'
 gem 'carrierwave'
 gem 'carrierwave-ftp', require: 'carrierwave/storage/sftp'
 gem 'cocoon'
 gem 'delayed_job'
 gem 'delayed_job_active_record'
 gem 'font_awesome5_rails'
-gem 'bootstrap', '~> 5.0.0.alpha1'
+gem 'bootstrap', '~> 5'
 gem 'friendly_id'
 gem 'haml'
 gem 'high_voltage'
 gem 'jquery-rails'
-gem 'jquery-ui-rails', '~> 6.0.1'
+gem 'jquery-ui-rails'
+# Use ActiveStorage variant
 gem 'mini_magick'
 gem 'nokogiri'
 gem 'omniauth'
 gem 'omniauth-github'
-gem 'omniauth-rails_csrf_protection', '~> 0.1'
-gem 'pg', '~>0.20.0'
+gem 'omniauth-rails_csrf_protection'
+gem 'pg'
 gem 'pickadate-rails'
 gem 'premailer-rails'
 gem 'puma'
 gem 'pundit'
 gem 'rails4-autocomplete'
 gem 'rolify'
-gem 'sass-rails', '~> 5.0.1'
+gem 'sassc-rails'
 gem 'simple_form'
 gem 'turbolinks'
-gem 'uglifier', '>= 1.3.0'
+gem 'terser', '~> 1.1'
 gem 'will_paginate'
-gem 'sprockets-rails', '3.2.2'
+gem 'sprockets-rails'
 
 gem 'icalendar'
 gem 'tzinfo-data'
@@ -53,6 +56,12 @@ gem 'public_activity'
 group :development do
   gem 'better_errors'
   gem 'letter_opener'
+  # Access an interactive console on exception pages or by calling 'console' anywhere in the code.
+  gem 'web-console', '>= 3.3.0'
+  gem 'listen', '>= 3.0.5', '< 3.2'
+  # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
+  gem 'spring'
+  gem 'spring-watcher-listen', '~> 2.0.0'
 end
 
 group :development, :test do