diff --git a/Gemfile b/Gemfile
index e7e19a239a851471fead11dd988c52da646f79fa..29ce5faa2321e6905a6178d5cb0f929a99ebc1b0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,7 +4,7 @@ gem 'rails', '3.2.13'
# Appserver
-gem 'unicorn', '4.6.2', :require => false
+gem 'unicorn', '4.6.3', :require => false
# API and JSON
@@ -33,24 +33,24 @@ gem 'rack-cors', '0.2.8', :require => 'rack/cors'
ENV['DB'] ||= 'mysql'
-gem 'mysql2', '0.3.11' if ENV['DB'] == 'all' || ENV['DB'] == 'mysql'
-gem 'pg', '0.15.1' if ENV['DB'] == 'all' || ENV['DB'] == 'postgres'
+gem 'mysql2', '0.3.13' if ENV['DB'] == 'all' || ENV['DB'] == 'mysql'
+gem 'pg', '0.16.0' if ENV['DB'] == 'all' || ENV['DB'] == 'postgres'
gem 'activerecord-import', '0.3.1'
-gem 'foreigner', '1.4.1'
+gem 'foreigner', '1.4.2'
# File uploading
-gem 'carrierwave', '0.8.0'
-gem 'fog', '1.12.1'
+gem 'carrierwave', '0.9.0'
+gem 'fog', '1.14.0'
gem 'mini_magick', '3.6.0'
-gem 'remotipart', '1.0.5'
+gem 'remotipart', '1.2.1'
# Localization
gem 'http_accept_language', '1.0.2'
gem 'i18n-inflector-rails', '~> 1.0'
-gem 'rails-i18n', '0.7.3'
+gem 'rails-i18n', '0.7.4'
# Mail
@@ -59,9 +59,9 @@ gem 'messagebus_ruby_api', '1.0.3'
# Parsing
-gem 'nokogiri', '1.5.9'
+gem 'nokogiri', '1.6.0'
gem 'rails_autolink', '1.1.0'
-gem 'redcarpet', '2.3.0'
+gem 'redcarpet', '3.0.0'
gem 'roxml', '3.1.6'
gem 'ruby-oembed', '0.8.8'
@@ -70,8 +70,8 @@ gem 'ruby-oembed', '0.8.8'
gem 'omniauth', '1.1.4'
gem 'omniauth-facebook', '1.4.1'
gem 'omniauth-tumblr', '1.1'
-gem 'omniauth-twitter', '0.0.16'
-gem 'twitter', '4.7.0'
+gem 'omniauth-twitter', '1.0.0'
+gem 'twitter', '4.8.1'
# Tags
@@ -79,8 +79,8 @@ gem 'acts-as-taggable-on', '2.4.1'
# URIs and HTTP
-gem 'addressable', '2.3.4', :require => 'addressable/uri'
-gem 'faraday', '0.8.7'
+gem 'addressable', '2.3.5', :require => 'addressable/uri'
+gem 'faraday', '0.8.8'
gem 'faraday_middleware', '0.9.0'
gem 'typhoeus', '0.6.3'
@@ -105,7 +105,7 @@ group :assets do
# Compression
- gem 'uglifier', '2.1.1'
+ gem 'uglifier', '2.1.2'
# JavaScript
@@ -146,7 +146,7 @@ group :production do # we don't install these on travis to speed up test runs
# Third party asset hosting
- gem 'asset_sync', '0.5.4', :require => false
+ gem 'asset_sync', '1.0.0', :require => false
end
group :development do
@@ -157,34 +157,34 @@ group :development do
# Automatic test runs
gem 'guard-cucumber', '1.4.0'
- gem 'guard-rspec', '3.0.1'
+ gem 'guard-rspec', '3.0.2'
gem 'rb-fsevent', '0.9.3', :require => false
gem 'rb-inotify', '0.9.0', :require => false
# Preloading environment
- gem 'guard-spork', '1.5.0'
+ gem 'guard-spork', '1.5.1'
gem 'spork', '1.0.0rc3'
end
group :test do
# RSpec (unit tests, some integration tests)
- gem 'fixture_builder', '0.3.5'
+ gem 'fixture_builder', '0.3.6'
gem 'fuubar', '1.1.1'
gem 'rspec-instafail', '0.2.4', :require => false
# Cucumber (integration tests)
gem 'capybara', '2.1.0'
- gem 'database_cleaner', '1.0.1'
+ gem 'database_cleaner', '1.1.0'
gem 'selenium-webdriver', '2.33.0'
# General helpers
gem 'factory_girl_rails', '4.2.1'
gem 'timecop', '0.6.1'
- gem 'webmock', '1.11.0', :require => false
+ gem 'webmock', '1.13.0', :require => false
end
@@ -197,5 +197,5 @@ group :development, :test do
# Jasmine (client side application tests (JS))
gem 'jasmine', '1.3.2'
- gem 'sinon-rails', '1.4.2.1'
+ gem 'sinon-rails', '1.7.3'
end
diff --git a/Gemfile.lock b/Gemfile.lock
index 9d6741320088a6f653c49fec99cea3040be9b0c6..8fc8b70108f50ac0e046794dce4c332095572212 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -36,12 +36,12 @@ GEM
activemodel (>= 3.0.0)
activesupport (>= 3.0.0)
rack (>= 1.1.0)
- addressable (2.3.4)
+ addressable (2.3.5)
arel (3.0.2)
- asset_sync (0.5.4)
+ asset_sync (1.0.0)
activemodel
- fog
- bcrypt-ruby (3.0.1)
+ fog (>= 1.8.0)
+ bcrypt-ruby (3.1.1)
bootstrap-sass (2.2.2.0)
sass (~> 3.2)
builder (3.0.4)
@@ -51,9 +51,10 @@ GEM
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (~> 2.0)
- carrierwave (0.8.0)
+ carrierwave (0.9.0)
activemodel (>= 3.2.0)
activesupport (>= 3.2.0)
+ json (>= 1.7)
celluloid (0.13.0)
timers (>= 1.0.0)
childprocess (0.3.9)
@@ -67,7 +68,7 @@ GEM
coffee-script (2.2.0)
coffee-script-source
execjs
- coffee-script-source (1.6.2)
+ coffee-script-source (1.6.3)
compass (0.12.2)
chunky_png (~> 1.2)
fssm (>= 0.2.7)
@@ -78,17 +79,18 @@ GEM
connection_pool (1.0.0)
crack (0.4.0)
safe_yaml (~> 0.9.0)
- cucumber (1.3.2)
+ cucumber (1.3.5)
builder (>= 2.1.2)
diff-lcs (>= 1.1.3)
gherkin (~> 2.12.0)
- multi_json (~> 1.3)
+ multi_json (~> 1.7.5)
+ multi_test (>= 0.0.2)
cucumber-rails (1.3.1)
capybara (>= 1.1.2)
cucumber (>= 1.2.0)
nokogiri (>= 1.5.0)
rails (~> 3.0)
- database_cleaner (1.0.1)
+ database_cleaner (1.1.0)
devise (2.1.3)
bcrypt-ruby (~> 3.0)
orm_adapter (~> 0.1)
@@ -99,7 +101,7 @@ GEM
ethon (0.5.12)
ffi (>= 1.3.0)
mime-types (~> 1.18)
- excon (0.23.0)
+ excon (0.25.3)
execjs (1.4.0)
multi_json (~> 1.0)
factory_girl (4.2.0)
@@ -107,27 +109,27 @@ GEM
factory_girl_rails (4.2.1)
factory_girl (~> 4.2.0)
railties (>= 3.0.0)
- faraday (0.8.7)
- multipart-post (~> 1.1)
+ faraday (0.8.8)
+ multipart-post (~> 1.2.0)
faraday_middleware (0.9.0)
faraday (>= 0.7.4, < 0.9)
ffi (1.9.0)
- fixture_builder (0.3.5)
+ fixture_builder (0.3.6)
activerecord (>= 2)
activesupport (>= 2)
- fog (1.12.1)
+ fog (1.14.0)
builder
- excon (~> 0.23.0)
+ excon (~> 0.25.0)
formatador (~> 0.2.0)
mime-types
multi_json (~> 1.0)
net-scp (~> 1.1)
net-ssh (>= 2.1.3)
- nokogiri (~> 1.5.0)
+ nokogiri (~> 1.5)
ruby-hmac
- font-awesome-rails (3.1.1.3)
+ font-awesome-rails (3.2.1.2)
railties (>= 3.2, < 5.0)
- foreigner (1.4.1)
+ foreigner (1.4.2)
activerecord (>= 3.0.0)
foreman (0.62.0)
thor (>= 0.13.6)
@@ -142,7 +144,7 @@ GEM
gon (4.1.1)
actionpack (>= 2.3.0)
json
- guard (1.8.0)
+ guard (1.8.2)
formatador (>= 0.2.4)
listen (>= 1.0.0)
lumberjack (>= 1.0.2)
@@ -151,10 +153,10 @@ GEM
guard-cucumber (1.4.0)
cucumber (>= 1.2.0)
guard (>= 1.1.0)
- guard-rspec (3.0.1)
+ guard-rspec (3.0.2)
guard (>= 1.8)
rspec (~> 2.13)
- guard-spork (1.5.0)
+ guard-spork (1.5.1)
childprocess (>= 0.2.3)
guard (>= 1.1)
spork (>= 0.8.4)
@@ -169,7 +171,7 @@ GEM
http_accept_language (1.0.2)
httpauth (0.2.0)
i18n (0.6.1)
- i18n-inflector (2.6.6)
+ i18n-inflector (2.6.7)
i18n (>= 0.4.1)
i18n-inflector-rails (1.0.6)
actionpack (~> 3.0)
@@ -195,32 +197,35 @@ GEM
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
kgio (2.8.0)
- listen (1.2.0)
+ listen (1.2.2)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
rb-kqueue (>= 0.2)
- lumberjack (1.0.3)
+ lumberjack (1.0.4)
mail (2.5.4)
mime-types (~> 1.16)
treetop (~> 1.4.8)
markerb (1.0.1)
redcarpet (>= 2.0)
messagebus_ruby_api (1.0.3)
- method_source (0.8.1)
+ method_source (0.8.2)
mime-types (1.23)
mini_magick (3.6.0)
subexec (~> 0.2.1)
+ mini_portile (0.5.1)
mobile-fu (1.2.1)
rack-mobile-detect
rails
multi_json (1.7.7)
+ multi_test (0.0.2)
multipart-post (1.2.0)
- mysql2 (0.3.11)
+ mysql2 (0.3.13)
nested_form (0.3.2)
- net-scp (1.1.1)
+ net-scp (1.1.2)
net-ssh (>= 2.6.5)
- net-ssh (2.6.7)
- nokogiri (1.5.9)
+ net-ssh (2.6.8)
+ nokogiri (1.6.0)
+ mini_portile (~> 0.5.0)
oauth (0.4.7)
oauth2 (0.8.1)
faraday (~> 0.8)
@@ -241,7 +246,7 @@ GEM
omniauth (~> 1.0)
omniauth-tumblr (1.1)
omniauth-oauth (~> 1.0)
- omniauth-twitter (0.0.16)
+ omniauth-twitter (1.0.0)
multi_json (~> 1.3)
omniauth-oauth (~> 1.0)
orm_adapter (0.4.0)
@@ -277,7 +282,7 @@ GEM
activesupport (= 3.2.13)
bundler (~> 1.0)
railties (= 3.2.13)
- rails-i18n (0.7.3)
+ rails-i18n (0.7.4)
i18n (~> 0.5)
rails_admin (0.4.9)
bootstrap-sass (~> 2.2)
@@ -304,7 +309,7 @@ GEM
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
raindrops (0.11.0)
- rake (10.0.4)
+ rake (10.1.0)
rb-fsevent (0.9.3)
rb-inotify (0.9.0)
ffi (>= 0.5.0)
@@ -312,11 +317,11 @@ GEM
ffi (>= 0.5.0)
rdoc (3.12.2)
json (~> 1.4)
- redcarpet (2.3.0)
+ redcarpet (3.0.0)
redis (3.0.4)
redis-namespace (1.3.0)
redis (~> 3.0.0)
- remotipart (1.0.5)
+ remotipart (1.2.1)
rmagick (2.13.2)
roxml (3.1.6)
activesupport (>= 2.3.0)
@@ -341,8 +346,8 @@ GEM
ruby-oembed (0.8.8)
ruby-progressbar (1.1.1)
rubyzip (0.9.9)
- safe_yaml (0.9.3)
- sass (3.2.9)
+ safe_yaml (0.9.4)
+ sass (3.2.10)
sass-rails (3.2.6)
railties (~> 3.2.0)
sass (>= 3.1.10)
@@ -363,12 +368,12 @@ GEM
rack (~> 1.3, >= 1.3.6)
rack-protection (~> 1.2)
tilt (~> 1.3, >= 1.3.3)
- sinon-rails (1.4.2.1)
+ sinon-rails (1.7.3)
railties (>= 3.1)
slim (1.3.9)
temple (~> 0.6.3)
tilt (~> 1.3, >= 1.3.3)
- slop (3.4.5)
+ slop (3.4.6)
spork (1.0.0rc3)
sprockets (2.2.2)
hike (~> 1.2)
@@ -376,7 +381,7 @@ GEM
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
subexec (0.2.3)
- temple (0.6.5)
+ temple (0.6.6)
thor (0.18.1)
tilt (1.4.1)
timecop (0.6.1)
@@ -384,23 +389,23 @@ GEM
treetop (1.4.14)
polyglot
polyglot (>= 0.3.1)
- twitter (4.7.0)
+ twitter (4.8.1)
faraday (~> 0.8, < 0.10)
multi_json (~> 1.0)
simple_oauth (~> 0.2)
typhoeus (0.6.3)
ethon (~> 0.5.11)
tzinfo (0.3.37)
- uglifier (2.1.1)
+ uglifier (2.1.2)
execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2)
- unicorn (4.6.2)
+ unicorn (4.6.3)
kgio (~> 2.6)
rack
raindrops (~> 0.7)
- warden (1.2.1)
+ warden (1.2.3)
rack (>= 1.0)
- webmock (1.11.0)
+ webmock (1.13.0)
addressable (>= 2.2.7)
crack (>= 0.3.2)
websocket (1.0.7)
@@ -415,29 +420,29 @@ DEPENDENCIES
activerecord-import (= 0.3.1)
acts-as-taggable-on (= 2.4.1)
acts_as_api (= 0.4.1)
- addressable (= 2.3.4)
- asset_sync (= 0.5.4)
+ addressable (= 2.3.5)
+ asset_sync (= 1.0.0)
bootstrap-sass (= 2.2.2.0)
capybara (= 2.1.0)
- carrierwave (= 0.8.0)
+ carrierwave (= 0.9.0)
client_side_validations (= 3.2.5)
compass-rails (= 1.0.3)
configurate (= 0.0.8)
cucumber-rails (= 1.3.1)
- database_cleaner (= 1.0.1)
+ database_cleaner (= 1.1.0)
devise (= 2.1.3)
factory_girl_rails (= 4.2.1)
- faraday (= 0.8.7)
+ faraday (= 0.8.8)
faraday_middleware (= 0.9.0)
- fixture_builder (= 0.3.5)
- fog (= 1.12.1)
- foreigner (= 1.4.1)
+ fixture_builder (= 0.3.6)
+ fog (= 1.14.0)
+ foreigner (= 1.4.2)
foreman (= 0.62)
fuubar (= 1.1.1)
gon (= 4.1.1)
guard-cucumber (= 1.4.0)
- guard-rspec (= 3.0.1)
- guard-spork (= 1.5.0)
+ guard-rspec (= 3.0.2)
+ guard-spork (= 1.5.1)
haml (= 4.0.3)
handlebars_assets (= 0.12.0)
http_accept_language (= 1.0.2)
@@ -449,12 +454,12 @@ DEPENDENCIES
messagebus_ruby_api (= 1.0.3)
mini_magick (= 3.6.0)
mobile-fu (= 1.2.1)
- mysql2 (= 0.3.11)
- nokogiri (= 1.5.9)
+ mysql2 (= 0.3.13)
+ nokogiri (= 1.6.0)
omniauth (= 1.1.4)
omniauth-facebook (= 1.4.1)
omniauth-tumblr (= 1.1)
- omniauth-twitter (= 0.0.16)
+ omniauth-twitter (= 1.0.0)
rack-cors (= 0.2.8)
rack-google-analytics (= 0.11.0)
rack-piwik (= 0.2.2)
@@ -462,13 +467,13 @@ DEPENDENCIES
rack-rewrite (= 1.3.3)
rack-ssl (= 1.3.3)
rails (= 3.2.13)
- rails-i18n (= 0.7.3)
+ rails-i18n (= 0.7.4)
rails_admin (= 0.4.9)
rails_autolink (= 1.1.0)
rb-fsevent (= 0.9.3)
rb-inotify (= 0.9.0)
- redcarpet (= 2.3.0)
- remotipart (= 1.0.5)
+ redcarpet (= 3.0.0)
+ remotipart (= 1.2.1)
rmagick (= 2.13.2)
roxml (= 3.1.6)
rspec-instafail (= 0.2.4)
@@ -478,13 +483,13 @@ DEPENDENCIES
selenium-webdriver (= 2.33.0)
sidekiq (= 2.11.1)
sinatra (= 1.3.3)
- sinon-rails (= 1.4.2.1)
+ sinon-rails (= 1.7.3)
slim (= 1.3.9)
spork (= 1.0.0rc3)
timecop (= 0.6.1)
- twitter (= 4.7.0)
+ twitter (= 4.8.1)
typhoeus (= 0.6.3)
- uglifier (= 2.1.1)
- unicorn (= 4.6.2)
- webmock (= 1.11.0)
+ uglifier (= 2.1.2)
+ unicorn (= 4.6.3)
+ webmock (= 1.13.0)
will_paginate (= 3.0.4)