Bump eslint from 8.0.0 to 8.0.1

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index 249a8ca19a325c52fea3b598482b63a9ce45442a..75cb1054bb0ced0350e7e2b4dc4ccde399f2bf5f 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -1,64 +1,56 @@
 source "https://rubygems.org"
 
 # Require rails
 source "https://rubygems.org"
 
 # Require rails

-gem "rails", "5.2.0"
-
-# Require things which have moved to gems in ruby 1.9
-gem "bigdecimal", "~> 1.1.0", :platforms => :ruby_19
-
-# Require things which have moved to gems in ruby 2.0
-gem "psych", :platforms => :ruby_20
+gem "rails", "6.1.4.1"

 
 # Require json for multi_json
 gem "json"
 
 # Use postgres as the database
 
 # Require json for multi_json
 gem "json"
 
 # Use postgres as the database

-gem "pg", "~> 0.18"
+gem "pg"

 
 # Use SCSS for stylesheets
 gem "sassc-rails"
 
 
 # Use SCSS for stylesheets
 gem "sassc-rails"
 

-# Use Uglifier as compressor for JavaScript assets
-gem "uglifier", ">= 1.3.0"
-
-# Use CoffeeScript for .js.coffee assets and views
-gem "coffee-rails", "~> 4.2"
+# Use Terser as compressor for JavaScript assets
+gem "terser"

 
 # Use jquery as the JavaScript library
 gem "jquery-rails"
 
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
 
 # Use jquery as the JavaScript library
 gem "jquery-rails"
 
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder

-# gem 'jbuilder', '~> 2.0'
-gem "jsonify-rails"
+gem "jbuilder", "~> 2.7"

 
 # Reduces boot times through caching; required in config/boot.rb
 
 # Reduces boot times through caching; required in config/boot.rb

-gem "bootsnap", ">= 1.1.0", :require => false
+gem "bootsnap", ">= 1.4.2", :require => false

 
 # Use R2 for RTL conversion
 gem "r2", "~> 0.2.7"
 
 # Use autoprefixer to generate CSS prefixes
 
 # Use R2 for RTL conversion
 gem "r2", "~> 0.2.7"
 
 # Use autoprefixer to generate CSS prefixes

-gem "autoprefixer-rails", "~> 8.6.3"
+gem "autoprefixer-rails"

 
 # Use image_optim to optimise images
 gem "image_optim_rails"
 
 # Load rails plugins
 
 # Use image_optim to optimise images
 gem "image_optim_rails"
 
 # Load rails plugins

+gem "actionpack-page_caching", ">= 1.2.0"
+gem "activerecord-import"

 gem "active_record_union"
 gem "active_record_union"

-gem "actionpack-page_caching"
+gem "bootstrap", "~> 4.5.0"
+gem "bootstrap_form", "~> 4.0"

 gem "cancancan"
 gem "cancancan"

-gem "composite_primary_keys", "~> 11.0.0"
+gem "composite_primary_keys", "~> 13.0.0"
+gem "config"

 gem "delayed_job_active_record"
 gem "delayed_job_active_record"

-gem "dynamic_form"
-gem "http_accept_language", "~> 2.0.0"
+gem "http_accept_language", "~> 2.1.1"

 gem "i18n-js", ">= 3.0.0"
 gem "oauth-plugin", ">= 0.5.1"
 gem "i18n-js", ">= 3.0.0"
 gem "oauth-plugin", ">= 0.5.1"

-gem "openstreetmap-deadlock_retry", ">= 1.3.0", :require => "deadlock_retry"
-gem "paperclip", "~> 5.2"
+gem "openstreetmap-deadlock_retry", ">= 1.3.1", :require => "deadlock_retry"

 gem "rack-cors"
 gem "rack-cors"

-gem "rails-i18n", "~> 4.0.0"
-gem "record_tag_helper"
-gem "rinku", ">= 1.2.2", :require => "rails_rinku"
+gem "rails-i18n", "~> 6.0.0"
+gem "rinku", ">= 2.0.6", :require => "rails_rinku"
+gem "strong_migrations"

 gem "validates_email_format_of", ">= 1.5.1"
 
 # Native OSM extensions
 gem "validates_email_format_of", ">= 1.5.1"
 
 # Native OSM extensions


@@ -68,16 +60,21 @@ gem "quad_tile", "~> 1.0.1"
 gem "rack-uri_sanitizer"
 
 # Omniauth for authentication
 gem "rack-uri_sanitizer"
 
 # Omniauth for authentication

-gem "omniauth"
+gem "omniauth", "~> 2.0.2"

 gem "omniauth-facebook"
 gem "omniauth-github"
 gem "omniauth-facebook"
 gem "omniauth-github"

-gem "omniauth-google-oauth2", ">= 0.2.7"
-gem "omniauth-mediawiki", ">= 0.0.3"
+gem "omniauth-google-oauth2", ">= 0.6.0"
+gem "omniauth-mediawiki", ">= 0.0.4"

 gem "omniauth-openid"
 gem "omniauth-openid"

+gem "omniauth-rails_csrf_protection", "~> 1.0"

 gem "omniauth-windowslive"
 
 gem "omniauth-windowslive"
 

+# Doorkeeper for OAuth2
+gem "doorkeeper"
+gem "doorkeeper-i18n"
+

 # Markdown formatting support
 # Markdown formatting support

-gem "redcarpet"
+gem "kramdown"

 
 # For status transitions of Issues
 gem "aasm"
 
 # For status transitions of Issues
 gem "aasm"


@@ -89,14 +86,11 @@ gem "libxml-ruby", ">= 2.0.5", :require => "libxml"
 gem "htmlentities"
 gem "sanitize"
 
 gem "htmlentities"
 gem "sanitize"
 

-# Load SystemTimer for implementing request timeouts
-gem "SystemTimer", ">= 1.1.3", :require => "system_timer", :platforms => :ruby_18
-

 # Load faraday for mockable HTTP client
 gem "faraday"
 
 # Load faraday for mockable HTTP client
 gem "faraday"
 

-# Load geoip for querying Maxmind GeoIP database
-gem "geoip"
+# Load maxminddb for querying Maxmind GeoIP database
+gem "maxminddb"

 
 # Load rotp to generate TOTP tokens
 gem "rotp"
 
 # Load rotp to generate TOTP tokens
 gem "rotp"


@@ -114,29 +108,47 @@ gem "canonical-rails"
 # Used to generate logstash friendly log files
 gem "logstasher"
 
 # Used to generate logstash friendly log files
 gem "logstasher"
 

+# Used to generate images for traces
+gem "bzip2-ffi"
+gem "ffi-libarchive"
+gem "gd2-ffij", ">= 0.4.0"
+gem "marcel"
+
+# Used for browser detection
+gem "browser"
+
+# Used for S3 object storage
+gem "aws-sdk-s3"
+
+# Used to resize user images
+gem "image_processing"
+

 # Gems useful for development
 group :development do
   gem "annotate"
   gem "better_errors"
   gem "binding_of_caller"
 # Gems useful for development
 group :development do
   gem "annotate"
   gem "better_errors"
   gem "binding_of_caller"

+  gem "debug_inspector"

   gem "listen"
   gem "vendorer"
 end
 
 # Gems needed for running tests
 group :test do
   gem "listen"
   gem "vendorer"
 end
 
 # Gems needed for running tests
 group :test do

-  gem "minitest", "~> 5.1", :platforms => [:ruby_19, :ruby_20]
+  gem "brakeman"
+  gem "capybara", ">= 2.15"
+  gem "erb_lint", :require => false
+  gem "factory_bot_rails"
+  gem "minitest", "~> 5.1"
+  gem "puma", "~> 5.3"

   gem "rails-controller-testing"
   gem "rubocop"
   gem "rails-controller-testing"
   gem "rubocop"

+  gem "rubocop-minitest"
+  gem "rubocop-performance"
+  gem "rubocop-rails", "~> 2.11.3" # Bug in 2.12.0, fixed in master after 2.12.2
+  gem "rubocop-rake"
+  gem "selenium-webdriver"
+  gem "simplecov", :require => false
+  gem "simplecov-lcov", :require => false

   gem "webmock"
 end
   gem "webmock"
 end

-
-# Needed in development as well so rake can see konacha tasks
-group :development, :test do
-  gem "capybara", "~> 2.13"
-  gem "coveralls", :require => false
-  gem "factory_bot_rails"
-  gem "jshint"
-  gem "poltergeist"
-  gem "puma", "~> 3.7"
-end