Merge branch 'main' into 2059-partner-groups

Author: edwinthinks

.all-contributorsrc

@@ -0,0 +1 @@
+defaults

.browserslistrc

@@ -8,4 +8,6 @@ PARTNER_BASE_URL="partner.test"
 FLIPPER_USERNAME="admin"
 FLIPPER_PASSWORD="password"
 SIDEKIQ_USERNAME="admin"
-SIDEKIQ_PASSWORD="password"
+SIDEKIQ_PASSWORD="password"
+RECAPTCHA_SITE_KEY=6LeIxAcTAAAAAJcZVRqyHh71UMIEGNQ_MXjiZKhI
+RECAPTCHA_PRIVATE_KEY=6LeIxAcTAAAAAGG-vFI1TnRWxMZNFuojJ4WifJWe

.env.example

@@ -0,0 +1,74 @@
+version: 2
+updates:
+- package-ecosystem: bundler
+  directory: "/"
+  schedule:
+    interval: daily
+  open-pull-requests-limit: 10
+  ignore:
+  - dependency-name: rubocop
+    versions:
+    - 1.10.0
+    - 1.11.0
+    - 1.12.0
+    - 1.12.1
+    - 1.13.0
+    - 1.9.0
+    - 1.9.1
+  - dependency-name: jwt
+    versions:
+    - 2.2.3
+  - dependency-name: geocoder
+    versions:
+    - 1.6.7
+  - dependency-name: devise_invitable
+    versions:
+    - 2.0.4
+  - dependency-name: knapsack_pro
+    versions:
+    - 2.13.0
+  - dependency-name: chartkick
+    versions:
+    - 4.0.0
+    - 4.0.2
+    - 4.0.3
+  - dependency-name: mini_racer
+    versions:
+    - 0.4.0
+  - dependency-name: nokogiri
+    versions:
+    - 1.11.3
+  - dependency-name: sidekiq
+    versions:
+    - 6.2.0
+    - 6.2.1
+  - dependency-name: listen
+    versions:
+    - 3.5.1
+  - dependency-name: rails
+    versions:
+    - 6.1.1
+    - 6.1.2
+    - 6.1.2.1
+    - 6.1.3
+  - dependency-name: skylight
+    versions:
+    - 5.0.0
+    - 5.0.1
+  - dependency-name: flipper-ui
+    versions:
+    - 0.20.4
+  - dependency-name: capistrano3-puma
+    versions:
+    - 5.0.3
+    - 5.0.4
+  - dependency-name: database_cleaner
+    versions:
+    - 2.0.0
+    - 2.0.1
+  - dependency-name: jbuilder
+    versions:
+    - 2.11.2
+  - dependency-name: capybara
+    versions:
+    - 3.35.1

.github/dependabot.yml

@@ -1,6 +1,9 @@
 name: rspec
 
 on:
+  push:
+    branches:
+      - main
   pull_request:
     branches:
       - main
@@ -57,6 +60,7 @@ jobs:
           POSTGRES_PASSWORD: password
           POSTGRES_HOST_AUTH_METHOD: trust
           POSTGRES_PORT: 5432
+          RAILS_ENV: test
         run: |
           bundle exec skylight disable_dev_warning
           yarn

.github/workflows/rspec-push.yml

@@ -67,3 +67,10 @@ coverage
 
 # Ignore node management configuration file
 .nvmrc
+
+/public/packs
+/public/packs-test
+/node_modules
+/yarn-error.log
+yarn-debug.log*
+.yarn-integrity

.github/workflows/rspec.yml

@@ -0,0 +1 @@
+12.14.1

.gitignore

@@ -7,8 +7,9 @@ end
 
 ruby "2.7.2"
 
-gem "api-auth", "~> 2.4"
-gem 'bootstrap', '~> 4.5.3'
+gem 'azure-storage', '~> 0.15.0.preview', require: false
+gem 'azure-storage-blob'
+gem 'bootstrap', '~> 4.6.0'
 gem 'bootstrap-daterangepicker-rails'
 gem 'bootstrap-select-rails'
 gem "bugsnag"
@@ -42,19 +43,27 @@ gem "simple_form"
 gem 'popper_js'
 gem "prawn-rails"
 gem "puma"
-gem "rails", "~> 6.0.3"
+gem "rails", "~> 6.1.4"
 gem "sass-rails"
 gem "sidekiq"
-gem 'sidekiq-scheduler'
-gem "skylight"
+gem "strong_migrations", "~> 0.7.7"
 gem "sprockets", "~> 4.0.2"
 gem "toastr-rails"
 gem "uglifier", ">= 1.3.0"
-gem "webpacker", "> 4.0"
+gem 'webpacker', '~> 5.4'
 gem "yajl-ruby"
+gem "recaptcha"
+gem "paper_trail" # for tracking history of InventoryItem
 
 group :production do
-  gem "newrelic_rpm"
+  gem 'lograge' # Reduce the noise of logs and include custom fields to it for easier access
+  gem "skylight"
+end
+
+group :development, :test, :staging do
+  gem 'factory_bot_rails'
+  gem "database_cleaner"
+  gem 'faker'
 end
 
 group :development, :test do
@@ -67,44 +76,44 @@ group :development, :test do
   gem "pry-remote"
   gem "pry-nav"
   gem "rb-readline", "~> 0.5.3"
-  gem "rspec-rails", "~> 4.0.2"
+  gem "rspec-rails", "~> 5.0.1"
   gem "rubocop"
   gem "rubocop-rails", "~> 2.9.1"
   gem "terminal-notifier-guard"
   gem "terminal-notifier"
-  gem "faker"
 end
 
 group :development do
   gem "annotate"
   gem "binding_of_caller"
   gem "better_errors"
+  gem "bullet"
   gem "capistrano-rails"
   gem "capistrano-rvm"
   gem "capistrano-bundler"
   gem "capistrano3-puma"
   gem "capistrano-rails-console", require: false
   gem 'capistrano-sidekiq'
+  gem 'foreman'
   gem "letter_opener"
-  gem "listen", "~> 3.4.0"
+  gem "listen", "~> 3.5.0"
   gem "rails-erd"
   gem "spring"
   gem "spring-watcher-listen"
   gem "web-console"
 end
 
 group :test do
-  gem "capybara", "~> 3.34"
+  gem "capybara", "~> 3.35"
   gem "capybara-screenshot"
-  gem "database_cleaner"
-  gem "factory_bot_rails"
   gem "launchy"
+  gem 'magic_test'
   gem "rails-controller-testing"
   gem "rspec-sidekiq"
   gem 'simplecov'
-  gem 'shoulda-matchers', '~> 4.4'
-  gem 'webdrivers', '~> 4.4'
-  gem "webmock", "~> 3.10"
+  gem 'shoulda-matchers', '~> 5.0'
+  gem 'webdrivers', '~> 4.6'
+  gem "webmock", "~> 3.12"
 end
 
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem