Remove the custom basic grid css rules

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index 772e6f300afa97f5a77fca6e8465ef9f1457fd5e..9a3fb1f6b03d3e82b49f74f5cace9443fb335e8e 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
 # Require rails
 source "https://rubygems.org"
 
 # Require rails

-gem "rails", "5.1.4"
+gem "rails", "6.0.2.1"

 
 # 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 1.9
 gem "bigdecimal", "~> 1.1.0", :platforms => :ruby_19


@@ -16,20 +16,19 @@ gem "json"
 gem "pg"
 
 # Use SCSS for stylesheets
 gem "pg"
 
 # Use SCSS for stylesheets

-gem "sass-rails", "~> 5.0"
+gem "sassc-rails"

 
 # Use Uglifier as compressor for JavaScript assets
 gem "uglifier", ">= 1.3.0"
 
 
 # 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 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
+gem "bootsnap", ">= 1.4.2", :require => false

 
 # Use R2 for RTL conversion
 gem "r2", "~> 0.2.7"
 
 # Use R2 for RTL conversion
 gem "r2", "~> 0.2.7"


@@ -41,20 +40,28 @@ gem "autoprefixer-rails"
 gem "image_optim_rails"
 
 # Load rails plugins
 gem "image_optim_rails"
 
 # Load rails plugins

-gem "actionpack-page_caching"
-gem "composite_primary_keys", "~> 10.0.0"
+gem "actionpack-page_caching", ">= 1.2.0"
+gem "active_record_union"
+gem "activerecord-import"
+gem "bootstrap", "~> 4.3.1"
+gem "cancancan"
+gem "composite_primary_keys", "~> 12.0.0"
+gem "config"
+gem "delayed_job_active_record"

 gem "dynamic_form"
 gem "http_accept_language", "~> 2.0.0"
 gem "i18n-js", ">= 3.0.0"
 gem "oauth-plugin", ">= 0.5.1"
 gem "openstreetmap-deadlock_retry", ">= 1.3.0", :require => "deadlock_retry"
 gem "dynamic_form"
 gem "http_accept_language", "~> 2.0.0"
 gem "i18n-js", ">= 3.0.0"
 gem "oauth-plugin", ">= 0.5.1"
 gem "openstreetmap-deadlock_retry", ">= 1.3.0", :require => "deadlock_retry"

-gem "paperclip", "~> 4.0"

 gem "rack-cors"
 gem "rails-i18n", "~> 4.0.0"
 gem "rack-cors"
 gem "rails-i18n", "~> 4.0.0"

-gem "record_tag_helper"
-gem "rinku", ">= 1.2.2", :require => "rails_rinku"
+gem "rinku", ">= 2.0.6", :require => "rails_rinku"
+gem "strong_migrations"

 gem "validates_email_format_of", ">= 1.5.1"
 
 gem "validates_email_format_of", ">= 1.5.1"
 

+# Native OSM extensions
+gem "quad_tile", "~> 1.0.1"
+

 # Sanitise URIs
 gem "rack-uri_sanitizer"
 
 # Sanitise URIs
 gem "rack-uri_sanitizer"
 


@@ -62,13 +69,16 @@ gem "rack-uri_sanitizer"
 gem "omniauth"
 gem "omniauth-facebook"
 gem "omniauth-github"
 gem "omniauth"
 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-windowslive"
 
 # Markdown formatting support
 gem "omniauth-openid"
 gem "omniauth-windowslive"
 
 # Markdown formatting support

-gem "redcarpet"
+gem "kramdown"
+
+# For status transitions of Issues
+gem "aasm"

 
 # Load libxml support for XML parsing and generation
 gem "libxml-ruby", ">= 2.0.5", :require => "libxml"
 
 # Load libxml support for XML parsing and generation
 gem "libxml-ruby", ">= 2.0.5", :require => "libxml"


@@ -83,8 +93,8 @@ gem "SystemTimer", ">= 1.1.3", :require => "system_timer", :platforms => :ruby_1
 # 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"


@@ -102,25 +112,48 @@ 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 "mimemagic"
+
+# Used for browser detection
+gem "browser"
+
+# Used for S3 object storage
+gem "aws-sdk-s3"
+
+# Used to resize user images
+gem "mini_magick"
+

 # Gems useful for development
 group :development do
 # Gems useful for development
 group :development do

+  gem "annotate"
+  gem "better_errors"
+  gem "binding_of_caller"

   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 "fakefs", :require => "fakefs/safe"

   gem "minitest", "~> 5.1", :platforms => [:ruby_19, :ruby_20]
   gem "rails-controller-testing"
   gem "rubocop"
   gem "minitest", "~> 5.1", :platforms => [:ruby_19, :ruby_20]
   gem "rails-controller-testing"
   gem "rubocop"

+  gem "rubocop-performance"
+  gem "rubocop-rails"

   gem "webmock"
 end
 
 # Needed in development as well so rake can see konacha tasks
 group :development, :test do
   gem "webmock"
 end
 
 # Needed in development as well so rake can see konacha tasks
 group :development, :test do

+  gem "capybara", ">= 2.15"

   gem "coveralls", :require => false
   gem "coveralls", :require => false

-  gem "factory_girl_rails"
-  gem "jshint"
-  #  gem "konacha"
+  gem "erb_lint", :require => false
+  gem "factory_bot_rails"

   gem "poltergeist"
   gem "poltergeist"

+  gem "puma", "~> 3.11"
+  gem "selenium-webdriver"

 end
 end