added aasm gem

2013-02-11 01:41:10 -06:00 · 2013-02-11 01:41:10 -06:00 · 6bb24a91ca
parent a9f0ec895d
commit 6bb24a91ca
2 changed files with 4 additions and 3 deletions
--- a/2
+++ b/2
@ -84,3 +84,5 @@ group :development, :test do
  gem 'execjs', '1.4.0'
  gem 'therubyracer' #, '0.11.0beta8'
 end
+
+gem 'aasm'
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -18,6 +18,7 @@ GEM
  remote: https://rubygems.org/
  remote: https://jamjam:blueberryjam@www.jamkazam.com/gems/
  specs:
+    aasm (3.0.16)
    actionmailer (3.2.9)
      actionpack (= 3.2.9)
      mail (~> 2.4.4)
@ -31,8 +32,6 @@ GEM
      rack-cache (~> 1.2)
      rack-test (~> 0.6.1)
      sprockets (~> 2.2.1)
-    active_scaffold (3.2.17)
-      rails (>= 3.1.3)
    activeadmin (0.5.1)
      arbre (>= 1.0.1)
      bourbon (>= 1.0.0)
@ -274,7 +273,7 @@ PLATFORMS
  ruby

 DEPENDENCIES
-  active_scaffold
+  aasm
  activeadmin
  amqp (= 0.9.8)
  bcrypt-ruby (= 3.0.1)