Merge remote-tracking branch 'upstream/pull/2063'

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index 898e009c19fd28f42503700aeb78299bca61cbe8..fa1bed46886eccae3b083b73794ba3a85e878e1a 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -71,13 +71,13 @@ gem "rack-uri_sanitizer"
 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 "redcarpet"
+gem "kramdown"
 
 # For status transitions of Issues
 gem "aasm"
@@ -114,6 +114,9 @@ gem "canonical-rails"
 # Used to generate logstash friendly log files
 gem "logstasher"
 
+# Used to generate images for traces
+gem "gd2-ffij"
+
 # Gems useful for development
 group :development do
   gem "annotate"
@@ -125,6 +128,7 @@ 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"