Commit f7b88d03
Changed files (2)
Gemfile
@@ -23,7 +23,6 @@ gem 'simplecov', :require => false, :group => :test
group :development, :test do
gem 'pg'
- #gem 'webrat'
gem 'rspec-rails'
gem 'jasmine'
gem 'sqlite3'
Gemfile.lock
@@ -46,7 +46,6 @@ GEM
activerecord (>= 3.0)
activesupport (~> 3.0)
awesome_nested_set (>= 2.0)
- addressable (2.3.2)
arbre (1.0.1)
activesupport (>= 3.0.0)
arel (3.0.2)
@@ -81,7 +80,7 @@ GEM
activesupport (>= 3.2.0)
carrierwave_backgrounder (0.1.3)
carrierwave (~> 0.5)
- childprocess (0.3.6)
+ childprocess (0.3.7)
ffi (~> 1.0, >= 1.0.6)
coderay (1.0.8)
coffee-rails (3.2.2)
@@ -98,15 +97,15 @@ GEM
activerecord (>= 2.1.0, < 4)
delayed_job (~> 3.0)
developwithpassion_arrays (0.0.1)
- devise (2.2.1)
+ devise (2.2.2)
bcrypt-ruby (~> 3.0)
orm_adapter (~> 0.1)
railties (~> 3.1)
warden (~> 1.2.1)
diff-lcs (1.1.3)
- em-websocket (0.3.8)
- addressable (>= 2.1.1)
+ em-websocket (0.4.0)
eventmachine (>= 0.12.9)
+ http_parser.rb (~> 0.5.3)
erubis (2.7.0)
eventmachine (1.0.0)
exception_notification (3.0.0)
@@ -115,10 +114,10 @@ GEM
excon (0.16.10)
execjs (1.4.0)
multi_json (~> 1.0)
- factory_girl (4.1.0)
+ factory_girl (4.2.0)
activesupport (>= 3.0.0)
- factory_girl_rails (4.1.0)
- factory_girl (~> 4.1.0)
+ factory_girl_rails (4.2.0)
+ factory_girl (~> 4.2.0)
railties (>= 3.0.0)
fakes (1.0.2)
developwithpassion_arrays
@@ -131,7 +130,7 @@ GEM
faraday (>= 0.7.4, < 0.9)
fastercsv (1.5.5)
ffi (1.3.1)
- fog (1.8.0)
+ fog (1.9.0)
builder
excon (~> 0.14)
formatador (~> 0.2.0)
@@ -144,16 +143,17 @@ GEM
formatador (0.2.4)
formtastic (2.2.1)
actionpack (>= 3.0)
- guard (1.6.1)
+ guard (1.6.2)
listen (>= 0.6.0)
lumberjack (>= 1.0.2)
pry (>= 0.9.10)
+ terminal-table (>= 1.4.3)
thor (>= 0.14.6)
guard-livereload (1.1.3)
em-websocket (>= 0.2.0)
guard (>= 1.5.0)
multi_json (~> 1.0)
- guard-rspec (2.3.3)
+ guard-rspec (2.4.0)
guard (>= 1.1)
rspec (~> 2.11)
guard-spork (1.4.1)
@@ -179,16 +179,13 @@ GEM
jquery-fileupload-rails (0.4.0)
actionpack (>= 3.1)
railties (>= 3.1)
- jquery-rails (2.1.4)
+ jquery-rails (2.2.0)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
json (1.7.6)
kaminari (0.14.1)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
- libwebsocket (0.1.7.1)
- addressable
- websocket
listen (0.7.2)
lumberjack (1.0.2)
mail (2.4.4)
@@ -211,18 +208,18 @@ GEM
net-ssh (2.6.3)
net-ssh-gateway (1.1.0)
net-ssh (>= 1.99.1)
- newrelic_rpm (3.5.5.38)
+ newrelic_rpm (3.5.6.46)
nokogiri (1.5.6)
orm_adapter (0.4.0)
pg (0.14.1)
polyamorous (0.5.0)
activerecord (~> 3.0)
polyglot (0.3.3)
- pry (0.9.10)
+ pry (0.9.11.4)
coderay (~> 1.0.5)
method_source (~> 0.8)
- slop (~> 3.3.1)
- rack (1.4.3)
+ slop (~> 3.4)
+ rack (1.4.4)
rack-cache (1.2)
rack (>= 0.4)
rack-ssl (1.3.2)
@@ -259,7 +256,7 @@ GEM
rspec-expectations (2.12.1)
diff-lcs (~> 1.1.3)
rspec-mocks (2.12.1)
- rspec-rails (2.12.1)
+ rspec-rails (2.12.2)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
@@ -271,21 +268,21 @@ GEM
rvm-capistrano (1.2.7)
capistrano (>= 2.0.0)
sass (3.2.5)
- sass-rails (3.2.5)
+ sass-rails (3.2.6)
railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3)
- selenium-webdriver (2.27.2)
+ selenium-webdriver (2.29.0)
childprocess (>= 0.2.5)
- libwebsocket (~> 0.1.3)
multi_json (~> 1.0)
rubyzip
+ websocket (~> 1.0.4)
simple_oauth (0.1.9)
simplecov (0.7.1)
multi_json (~> 1.0)
simplecov-html (~> 0.7.1)
simplecov-html (0.7.1)
- slop (3.3.3)
+ slop (3.4.3)
spork (0.9.2)
sprockets (2.2.2)
hike (~> 1.2)
@@ -294,7 +291,8 @@ GEM
tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.7)
stringex (1.5.1)
- thor (0.16.0)
+ terminal-table (1.4.5)
+ thor (0.17.0)
tilt (1.3.3)
tinder (1.9.2)
eventmachine (~> 1.0)
@@ -318,7 +316,7 @@ GEM
multi_json (~> 1.0, >= 1.0.2)
warden (1.2.1)
rack (>= 1.0)
- websocket (1.0.6)
+ websocket (1.0.7)
xpath (1.0.0)
nokogiri (~> 1.3)