Revert en-GB.yml to master.

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index 48658f65d371f1097f440d0dee50e35baa8dc6d3..67a3a1f5ede13ba7b9d80fc9cb5cd77ae6d7d6c9 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.0.5"
+gem "rails", "5.1.4"

 
 # 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


@@ -32,7 +32,7 @@ gem "jquery-rails"
 gem "jsonify-rails"
 
 # Use R2 for RTL conversion
 gem "jsonify-rails"
 
 # Use R2 for RTL conversion

-gem "r2"
+gem "r2", "~> 0.2.7"

 
 # Use autoprefixer to generate CSS prefixes
 gem "autoprefixer-rails"
 
 # Use autoprefixer to generate CSS prefixes
 gem "autoprefixer-rails"


@@ -42,12 +42,12 @@ gem "image_optim_rails"
 
 # Load rails plugins
 gem "actionpack-page_caching"
 
 # Load rails plugins
 gem "actionpack-page_caching"

-gem "composite_primary_keys", "~> 9.0.7"
-gem "deadlock_retry", ">= 1.2.0"
+gem "composite_primary_keys", "~> 10.0.0"

 gem "dynamic_form"
 gem "http_accept_language", "~> 2.0.0"
 gem "i18n-js", ">= 3.0.0"
 gem "oauth-plugin", ">= 0.5.1"
 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 "paperclip", "~> 4.0"
 gem "rack-cors"
 gem "rails-i18n", "~> 4.0.0"


@@ -70,6 +70,9 @@ gem "omniauth-windowslive"
 # Markdown formatting support
 gem "redcarpet"
 
 # Markdown formatting support
 gem "redcarpet"
 

+# 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"
 


@@ -104,6 +107,7 @@ gem "logstasher"
 
 # Gems useful for development
 group :development do
 
 # Gems useful for development
 group :development do

+  gem "annotate"

   gem "listen"
   gem "vendorer"
 end
   gem "listen"
   gem "vendorer"
 end


@@ -118,9 +122,10 @@ end
 
 # Needed in development as well so rake can see konacha tasks
 group :development, :test do
 
 # Needed in development as well so rake can see konacha tasks
 group :development, :test do

+  gem "capybara", "~> 2.13"

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

-  gem "factory_girl_rails"
+  gem "factory_bot_rails"

   gem "jshint"
   gem "jshint"

-  #  gem "konacha"

   gem "poltergeist"
   gem "poltergeist"

+  gem "puma", "~> 3.7"

 end
 end