Merge branch 'master' into moderation

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index 79d95f9d5af3e7bc91376002e0e3574997c28aa8..43f39340a812d78ad5ad660ffada06872d2a2fc0 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -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"
 


@@ -112,6 +115,7 @@ end
 # Gems needed for running tests
 group :test do
   gem "minitest", "~> 5.1", :platforms => [:ruby_19, :ruby_20]
 # Gems needed for running tests
 group :test do
   gem "minitest", "~> 5.1", :platforms => [:ruby_19, :ruby_20]

+  gem "minitest-rails-capybara"

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