Commit 96853719
Changed files (2)
Gemfile
@@ -17,6 +17,7 @@ gem 'capistrano'
gem 'capistrano-ext'
gem 'rvm-capistrano'
gem 'exception_notification'
+gem "formtastic", "~> 2.1.1"
gem 'activeadmin'
gem 'sass-rails'
gem 'meta_search', '>= 1.1.0.pre'
Gemfile.lock
@@ -40,7 +40,7 @@ GEM
activesupport (3.2.3)
i18n (~> 0.6)
multi_json (~> 1.0)
- addressable (2.2.7)
+ addressable (2.2.8)
ansi (1.4.2)
arel (3.0.2)
bcrypt-ruby (3.0.1)
@@ -108,12 +108,12 @@ GEM
nokogiri (~> 1.5.0)
ruby-hmac
formatador (0.2.1)
- formtastic (2.2.0)
- actionpack (>= 3.0)
+ formtastic (2.1.1)
+ actionpack (~> 3.0)
growl (1.0.3)
growl_notify (0.0.3)
rb-appscript
- guard (1.0.1)
+ guard (1.0.2)
ffi (>= 0.5.0)
thor (~> 0.14.6)
guard-livereload (0.4.2)
@@ -156,7 +156,7 @@ GEM
activesupport (~> 3.1)
polyamorous (~> 0.5.0)
mime-types (1.18)
- multi_json (1.3.2)
+ multi_json (1.3.4)
net-scp (1.0.4)
net-ssh (>= 1.99.1)
net-sftp (2.0.5)
@@ -201,22 +201,24 @@ GEM
railties (~> 3.1)
riddle (1.5.1)
rmagick (2.13.1)
- rspec (2.9.0)
- rspec-core (~> 2.9.0)
- rspec-expectations (~> 2.9.0)
- rspec-mocks (~> 2.9.0)
- rspec-core (2.9.0)
- rspec-expectations (2.9.1)
+ rspec (2.10.0)
+ rspec-core (~> 2.10.0)
+ rspec-expectations (~> 2.10.0)
+ rspec-mocks (~> 2.10.0)
+ rspec-core (2.10.0)
+ rspec-expectations (2.10.0)
diff-lcs (~> 1.1.3)
- rspec-mocks (2.9.0)
- rspec-rails (2.9.0)
+ rspec-mocks (2.10.0)
+ rspec-rails (2.10.0)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
- rspec (~> 2.9.0)
+ rspec (~> 2.10.0)
ruby-hmac (0.4.0)
ruby_gntp (0.3.4)
rubyzip (0.9.8)
+ rvm-capistrano (1.1.0)
+ capistrano (>= 2.0.0)
sass (3.1.16)
sass-rails (3.2.5)
railties (~> 3.2.0)
@@ -276,6 +278,7 @@ DEPENDENCIES
exception_notification
factory_girl_rails
fog
+ formtastic (~> 2.1.1)
growl
growl_notify
guard-livereload
@@ -292,6 +295,7 @@ DEPENDENCIES
rmagick
rspec-rails
ruby_gntp
+ rvm-capistrano
sass-rails
sqlite3-ruby
thinking-sphinx