Localisation updates from https://translatewiki.net.

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index 9d759548cf048854e0638d0280e37e9fa598ffd0..f75921f123d5303424b92e0b35cddb99710200d1 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.2.0"
+gem "rails", "5.2.2"

 
 # 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,7 +16,7 @@ gem "json"
 gem "pg", "~> 0.18"
 
 # Use SCSS for stylesheets
 gem "pg", "~> 0.18"
 
 # 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"


@@ -38,14 +38,17 @@ gem "bootsnap", ">= 1.1.0", :require => false
 gem "r2", "~> 0.2.7"
 
 # Use autoprefixer to generate CSS prefixes
 gem "r2", "~> 0.2.7"
 
 # Use autoprefixer to generate CSS prefixes

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

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

-gem "composite_primary_keys", "~> 11.0.0"
+gem "active_record_union"
+gem "cancancan"
+gem "composite_primary_keys", "~> 11.1.0"
+gem "delayed_job_active_record"

 gem "dynamic_form"
 gem "http_accept_language", "~> 2.0.0"
 gem "i18n-js", ">= 3.0.0"
 gem "dynamic_form"
 gem "http_accept_language", "~> 2.0.0"
 gem "i18n-js", ">= 3.0.0"


@@ -68,8 +71,8 @@ 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"
 
 gem "omniauth-openid"
 gem "omniauth-windowslive"