Merge pull request #79 from kabisa/upgrade-rails-to-6

Upgrade rails to 6

.github/workflows/ruby.yml

@@ -34,9 +34,14 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
+
+      - name: Install dependencies
+        run: sudo apt-get update && sudo apt-get install -y libmagickwand-dev imagemagick
+
       - uses: ruby/setup-ruby@v1
         with:
           bundler-cache: true
+
       - name: Setup environment and database
         run: |
           cp env.example .env

.tool-versions

@@ -1 +1 @@
-ruby 2.7.0
+ruby 2.7.8

Gemfile

@@ -1,61 +1,59 @@
+
 # frozen_string_literal: true
 
 source 'https://rubygems.org'
 
-ruby '2.7.0'
+ruby '2.7.8'
 
-gem "activerecord-typedstore", "~> 1.1.1"
-gem "actionpack", "~> 5.2", ">= 5.2.1"
+gem "activerecord-typedstore", "~> 1.6"
 gem "acts_as_votable", "~> 0.10.0"
-gem "autoprefixer-rails", "~> 9.3", ">= 9.3.1"
+gem "autoprefixer-rails", "~> 10.4", ">= 10.4.7.0"
 gem 'aws-sdk-s3', '~> 1.67', '>= 1.67', require: false
 gem "chronic", "~> 0.10.2"
 gem "coffee-rails", "~> 4.2", ">= 4.2.2"
-gem "devise", "~> 4.7.1"
+gem "devise", "~> 4.8"
 gem 'devise-async', '~> 1.0'
 gem "doorkeeper", "~> 4.3"
 gem "delayed_paperclip", "~> 3.0.1"
 gem "daemons"
-gem "draper", "~> 3.0", ">= 3.0.1"
+gem "draper", "~> 4.0", ">= 4.0.2"
 gem "fcm", "~> 0.0.2"
 gem 'file_validators', '~> 2.3'
 gem "friendly_id", "~> 5.2.4"
 gem "google-id-token", "~> 1.4"
-gem "graphql", "~> 1.8", ">= 1.8.10"
-gem "graphql-batch", "~> 0.3.10"
-gem 'graphql-guard', '~> 1.2', '>= 1.2.1'
-gem 'graphql_playground-rails', '~> 2.0', '>= 2.0.1'
-gem "haml-rails", "~> 1.0"
+gem "graphql", "~> 1.10"
+gem "graphql-batch", "~> 0.6.0"
+# gem 'graphql-guard', '~> 2.0', '>= 2.0.0'
+gem 'graphql-playground', "0.1.2"
+gem "haml-rails", "~> 2.1"
 gem "jbuilder", "~> 2.0"
 gem 'json', '~> 2.7', '>= 2.7.2'
 gem "json_web_token", "~> 0.3.5"
 gem "loofah", "~> 2.3.1"
 gem 'mini_magick', '~> 4.9', '>= 4.9.2'
-gem "nokogiri", "~> 1.10.8"
+gem "nokogiri", "~> 1.13.0"
 gem "paperclip", "~> 6.1"
 gem "pg", "~> 1.5"
-gem "premailer-rails", "~> 1.9.7"
-gem "puma", "~> 3.12"
+gem "premailer-rails", "~> 1.10"
+gem "puma", "~> 5.0"
 gem "rabl", "~> 0.13.1"
 gem "rack-cors", "~> 1.0.5"
-gem "rails", "~> 5.2", ">= 5.2.1"
-gem "rails-controller-testing", "~> 1.0.2"
-gem "rails-html-sanitizer", "~> 1.0.4"
+gem "rails", "~> 6.1"
+gem "rails-controller-testing", "~> 1.0.5"
+gem "rails-html-sanitizer", "~> 1.2.0"
 gem "rails_autolink", "~> 1.1.6"
-gem "railties", "~> 5.2", ">= 5.2.1"
 gem 'rmagick', '~> 5.3.0'
 gem "rubocop", "~> 0.83.0", require: false
 gem "rubyzip", "~> 1.3.0", require: "zip"
 gem "sentry-raven"
 gem "settingslogic", "~> 2.0", ">= 2.0.9"
 gem "scss_lint", "~> 0.54", require: false
-gem 'sidekiq', '~> 5.2', '>= 5.2.3'
+gem 'sidekiq', '~> 6.0'
 gem 'slack-ruby-client', '~> 0.14.6'
-gem 'apollo_upload_server', '2.0.5'
+gem 'apollo_upload_server', '~> 2.1.0'
 gem 'image_processing', '1.12.2'
 
 group :development, :staging, :test do
-  # GraphQL UI similar to GraphiQL but better
   gem 'database_cleaner', '~> 1.7'
   gem 'faker', '~> 1.9', '>= 1.9.1'
 end
@@ -64,33 +62,17 @@ group :development, :test do
   gem 'dotenv-rails', '~> 2.5'
   gem 'factory_bot_rails', '~> 4.8', '>= 4.8.2'
   gem 'graphlient', '~> 0.3.3'
-  gem 'pry', '~> 0.11.3'
-end
-
-group :test do
-  gem 'rubocop-rspec', '~> 1.30'
-  gem 'rspec-rails', '~> 3.8'
-  gem 'rspec-graphql_matchers', '~> 0.7.1'
+  gem 'listen', '~> 3.2'
+  gem 'pry', '~> 0.13'
+  gem 'pry-rails'
+  gem 'rspec-rails', '~> 4.0'
   gem 'shoulda-matchers', '~> 5.3'
-  gem 'simplecov', '~> 0.16.1', require: false
+  gem 'simplecov', '~> 0.16.1'
+  gem 'spring'
+  gem 'spring-watcher-listen', '~> 2.0.0'
   gem 'timecop', '~> 0.9.1'
 end
 
 group :development do
-  # Access an IRB console on exception pages or by using <%= console %> anywhere in the code.
   gem 'web-console', '>= 3.3.0'
-  gem 'listen', '~> 3.0.5'
-  # 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'
-  # Pry as rails console
-  gem 'pry-rails'
-
-  gem 'rails-erd'
-  gem 'railroady'
 end
-
-group :production do
-  gem 'rails_12factor', '~> 0.0.3'
-end
-