Merge branch 'master' into setup/pagination

Gemfile

@@ -1,15 +1,17 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
 ruby '2.6.1'
 
-gem 'rails'
+gem 'jbuilder'
 gem 'pg'
 gem 'puma'
+gem 'rails'
 gem 'sass-rails'
-gem 'webpacker'
 gem 'turbolinks'
-gem 'jbuilder'
+gem 'webpacker'
 # Use Redis adapter to run Action Cable in production
 # gem 'redis', '~> 4.0'
 # Use Active Model has_secure_password
@@ -23,8 +25,8 @@ gem 'bootsnap', '>= 1.4.2', require: false
 
 gem 'lockbox'
 
-gem 'aws-sdk-s3', require: false
 gem 'airrecord'
+gem 'aws-sdk-s3', require: false
 gem 'google-api-client'
 gem 'rack-cors'
 gem 'sentry-raven'
@@ -34,8 +36,11 @@ gem 'pagy'
 
 group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console
-  gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]
+  gem 'byebug', platforms: %i[mri mingw x64_mingw]
   gem 'dotenv-rails'
+  gem 'rubocop', require: false
+  gem 'rubocop-rails', require: false
+  gem 'rubocop-rspec', require: false
 end
 
 group :development do
@@ -57,4 +62,4 @@ group :test do
 end
 
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
-gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
+gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw jruby]