diff --git a/Gemfile b/Gemfile index b4366b551..65bfc6fc3 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,7 @@ gem 'rails', '3.2.18' # Appserver -gem 'unicorn', '4.8.0', :require => false +gem 'unicorn', '4.8.3', :require => false # API and JSON @@ -13,7 +13,7 @@ gem 'json', '1.8.1' # Authentication -gem 'devise', '3.2.2' +gem 'devise', '3.2.4' gem 'devise_lastseenable', '0.0.4' # Captcha @@ -31,13 +31,13 @@ gem 'configurate', '0.0.8' # Cross-origin resource sharing -gem 'rack-cors', '0.2.8', :require => 'rack/cors' +gem 'rack-cors', '0.2.9', :require => 'rack/cors' # Database ENV['DB'] ||= 'mysql' -gem 'mysql2', '0.3.14' if ENV['DB'] == 'all' || ENV['DB'] == 'mysql' +gem 'mysql2', '0.3.16' if ENV['DB'] == 'all' || ENV['DB'] == 'mysql' gem 'pg', '0.17.1' if ENV['DB'] == 'all' || ENV['DB'] == 'postgres' gem 'activerecord-import', '0.3.1' @@ -45,8 +45,8 @@ gem 'foreigner', '1.6.1' # File uploading -gem 'carrierwave', '0.9.0' -gem 'fog', '1.19.0' +gem 'carrierwave', '0.10.0' +gem 'fog', '1.22.1' gem 'mini_magick', '3.7.0' gem 'remotipart', '1.2.1' @@ -61,31 +61,31 @@ gem 'rails-i18n', '0.7.4' # Mail -gem 'markerb', '1.0.1' +gem 'markerb', '1.0.2' gem 'messagebus_ruby_api', '1.0.3' # Parsing -gem 'nokogiri', '1.6.1' +gem 'nokogiri', '1.6.2.1' gem 'rails_autolink', '1.1.5' -gem 'redcarpet', '3.1.1' +gem 'redcarpet', '3.1.2' gem 'roxml', '3.1.6' gem 'ruby-oembed', '0.8.9' gem 'opengraph_parser', '0.2.3' # Please remove when migrating to Rails 4 -gem 'strong_parameters' +gem 'strong_parameters', '0.2.3' # Services -gem 'omniauth', '1.1.4' +gem 'omniauth', '1.2.1' gem 'omniauth-facebook', '1.6.0' gem 'omniauth-tumblr', '1.1' gem 'omniauth-twitter', '1.0.1' gem 'twitter', '4.8.1' -gem 'omniauth-wordpress','0.2.0' +gem 'omniauth-wordpress','0.2.1' # Tags @@ -93,18 +93,18 @@ gem 'acts-as-taggable-on', '2.4.1' # URIs and HTTP -gem 'addressable', '2.3.5', :require => 'addressable/uri' +gem 'addressable', '2.3.6', :require => 'addressable/uri' gem 'faraday', '0.8.9' gem 'faraday_middleware', '0.9.0' -gem 'typhoeus', '0.6.7' +gem 'typhoeus', '0.6.8' # Views -gem 'gon', '4.1.1' +gem 'gon', '5.0.4' gem 'haml', '4.0.5' gem 'mobile-fu', '1.2.2' gem 'will_paginate', '3.0.5' -gem 'rails-timeago' +gem 'rails-timeago', '2.4.0' # Workarounds # https://github.com/rubyzip/rubyzip#important-note @@ -115,21 +115,21 @@ gem 'zip-zip' group :assets do # Icons - gem 'entypo-rails' + gem 'entypo-rails', '2.2.1' # CSS gem 'bootstrap-sass', '2.2.2.0' - gem 'compass-rails', '1.0.3' + gem 'compass-rails', '1.1.7' gem 'sass-rails', '3.2.6' # Compression - gem 'uglifier', '2.1.2' + gem 'uglifier', '2.5.0' # JavaScript - gem 'backbone-on-rails', '1.1.0' + gem 'backbone-on-rails', '1.1.1' gem 'handlebars_assets', '0.12.0' gem 'jquery-rails', '3.0.4' @@ -173,9 +173,9 @@ end group :development do # Automatic test runs gem 'guard-cucumber', '1.4.1' - gem 'guard-rspec', '4.2.4' + gem 'guard-rspec', '4.2.9' gem 'rb-fsevent', '0.9.4', :require => false - gem 'rb-inotify', '0.9.3', :require => false + gem 'rb-inotify', '0.9.4', :require => false # Preloading environment @@ -187,32 +187,32 @@ group :test do # RSpec (unit tests, some integration tests) gem 'fixture_builder', '0.3.6' - gem 'fuubar', '1.3.2' + gem 'fuubar', '1.3.3' gem 'rspec-instafail', '0.2.4', :require => false - gem 'test_after_commit', '0.2.2' + gem 'test_after_commit', '0.2.3' # Cucumber (integration tests) gem 'capybara', '2.2.1' - gem 'database_cleaner', '1.2.0' - gem 'selenium-webdriver', '2.39.0' + gem 'database_cleaner', '1.3.0' + gem 'selenium-webdriver', '2.42.0' # General helpers - gem 'factory_girl_rails', '4.3.0' + gem 'factory_girl_rails', '4.4.1' gem 'timecop', '0.7.1' - gem 'webmock', '1.16.1', :require => false + gem 'webmock', '1.18.0', :require => false end group :development, :test do # RSpec (unit tests, some integration tests) - gem "rspec-rails", '2.14.1' + gem "rspec-rails", '2.14.2' # Cucumber (integration tests) - gem 'cucumber-rails', '1.4.0', :require => false + gem 'cucumber-rails', '1.4.1', :require => false # Jasmine (client side application tests (JS)) gem 'jasmine', '1.3.2' - gem 'sinon-rails', '1.7.3' + gem 'sinon-rails', '1.9.0' end diff --git a/Gemfile.lock b/Gemfile.lock index 49be46e1b..c88ddbab9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -36,18 +36,21 @@ GEM activemodel (>= 3.0.0) activesupport (>= 3.0.0) rack (>= 1.1.0) - addressable (2.3.5) + addressable (2.3.6) arel (3.0.3) asset_sync (1.0.0) activemodel fog (>= 1.8.0) - atomic (1.1.14) - backbone-on-rails (1.1.0.0) + backbone-on-rails (1.1.1.0) + actionmailer + actionpack + activemodel + activeresource eco ejs jquery-rails - rails (>= 3.1) - bcrypt-ruby (3.1.2) + railties + bcrypt (3.1.7) bootstrap-sass (2.2.2.0) sass (~> 3.2) builder (3.0.4) @@ -57,15 +60,16 @@ GEM rack (>= 1.0.0) rack-test (>= 0.5.4) xpath (~> 2.0) - carrierwave (0.9.0) + carrierwave (0.10.0) activemodel (>= 3.2.0) activesupport (>= 3.2.0) json (>= 1.7) + mime-types (>= 1.16) celluloid (0.15.2) timers (~> 1.1.0) - childprocess (0.3.9) + childprocess (0.5.3) ffi (~> 1.0, >= 1.0.11) - chunky_png (1.2.9) + chunky_png (1.3.1) coderay (1.1.0) coffee-rails (3.2.2) coffee-script (>= 2.2.0) @@ -73,31 +77,33 @@ GEM coffee-script (2.2.0) coffee-script-source execjs - coffee-script-source (1.6.3) - compass (0.12.2) + coffee-script-source (1.7.0) + compass (0.12.6) chunky_png (~> 1.2) fssm (>= 0.2.7) - sass (~> 3.1) - compass-rails (1.0.3) - compass (>= 0.12.2, < 0.14) + sass (~> 3.2.19) + compass-rails (1.1.7) + compass (>= 0.12.2) + sprockets (<= 2.11.0) configurate (0.0.8) connection_pool (1.2.0) crack (0.4.1) safe_yaml (~> 0.9.0) - cucumber (1.3.10) + cucumber (1.3.15) builder (>= 2.1.2) diff-lcs (>= 1.1.3) gherkin (~> 2.12) multi_json (>= 1.7.5, < 2.0) - multi_test (>= 0.0.2) - cucumber-rails (1.4.0) - capybara (>= 1.1.2) - cucumber (>= 1.2.0) - nokogiri (>= 1.5.0) - rails (>= 3.0.0) - database_cleaner (1.2.0) - devise (3.2.2) - bcrypt-ruby (~> 3.0) + multi_test (>= 0.1.1) + cucumber-rails (1.4.1) + capybara (>= 1.1.2, < 3) + cucumber (>= 1.3.8, < 2) + mime-types (~> 1.16) + nokogiri (~> 1.5) + rails (>= 3, < 5) + database_cleaner (1.3.0) + devise (3.2.4) + bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 3.2.6, < 5) thread_safe (~> 0.1) @@ -116,19 +122,17 @@ GEM execjs eco-source (1.1.0.rc.1) ejs (1.1.1) - entypo-rails (2.0.2) + entypo-rails (2.2.1) railties (>= 3.1, <= 5) erubis (2.7.0) - ethon (0.6.2) + ethon (0.7.0) ffi (>= 1.3.0) - mime-types (~> 1.18) - excon (0.31.0) - execjs (1.4.0) - multi_json (~> 1.0) - factory_girl (4.3.0) + excon (0.34.0) + execjs (2.1.0) + factory_girl (4.4.0) activesupport (>= 3.0.0) - factory_girl_rails (4.3.0) - factory_girl (~> 4.3.0) + factory_girl_rails (4.4.1) + factory_girl (~> 4.4.0) railties (>= 3.0.0) faraday (0.8.9) multipart-post (~> 1.2.0) @@ -138,43 +142,51 @@ GEM fixture_builder (0.3.6) activerecord (>= 2) activesupport (>= 2) - fog (1.19.0) + fog (1.22.1) + fog-brightbox + fog-core (~> 1.22) + fog-json + ipaddress (~> 0.5) + nokogiri (~> 1.5, >= 1.5.11) + fog-brightbox (0.0.2) + fog-core + fog-json + fog-core (1.22.0) builder - excon (~> 0.31.0) - formatador (~> 0.2.0) + excon (~> 0.33) + formatador (~> 0.2) mime-types - multi_json (~> 1.0) net-scp (~> 1.1) net-ssh (>= 2.1.3) - nokogiri (~> 1.5) - ruby-hmac + fog-json (1.0.0) + multi_json (~> 1.0) font-awesome-rails (3.2.1.2) railties (>= 3.2, < 5.0) foreigner (1.6.1) activerecord (>= 3.0.0) foreman (0.62.0) thor (>= 0.13.6) - formatador (0.2.4) + formatador (0.2.5) fssm (0.2.10) - fuubar (1.3.2) + fuubar (1.3.3) rspec (>= 2.14.0, < 3.1.0) - ruby-progressbar (~> 1.3) + ruby-progressbar (~> 1.4) galetahub-simple_captcha (0.1.5) gherkin (2.12.2) multi_json (~> 1.3) - gon (4.1.1) + gon (5.0.4) actionpack (>= 2.3.0) json - guard (2.2.5) + guard (2.6.1) formatador (>= 0.2.4) - listen (~> 2.1) + listen (~> 2.7) lumberjack (~> 1.0) pry (>= 0.9.12) thor (>= 0.18.1) guard-cucumber (1.4.1) cucumber (>= 1.2.0) guard (>= 1.1.0) - guard-rspec (4.2.4) + guard-rspec (4.2.9) guard (~> 2.1) rspec (>= 2.14, < 4.0) guard-spork (1.5.1) @@ -187,10 +199,9 @@ GEM execjs (>= 1.2.9) sprockets (>= 2.0.3) tilt - hashie (2.0.5) + hashie (2.1.1) hike (1.2.3) http_accept_language (1.0.2) - httpauth (0.2.0) i18n (0.6.9) i18n-inflector (2.6.7) i18n (>= 0.4.1) @@ -198,6 +209,7 @@ GEM actionpack (>= 3.0.0) i18n-inflector (~> 2.6) railties (>= 3.0.0) + ipaddress (0.8.0) jasmine (1.3.2) jasmine-core (~> 1.3.1) rack (~> 1.0) @@ -212,82 +224,83 @@ GEM jquery-rails railties (>= 3.1.0) json (1.8.1) - jwt (0.1.10) - multi_json (>= 1.5) + jwt (1.0.0) kaminari (0.15.1) actionpack (>= 3.0.0) activesupport (>= 3.0.0) - kgio (2.8.1) - listen (2.4.0) + kgio (2.9.2) + listen (2.7.5) celluloid (>= 0.15.2) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) - lumberjack (1.0.4) + lumberjack (1.0.6) macaddr (1.6.1) systemu (~> 2.5.0) mail (2.5.4) mime-types (~> 1.16) treetop (~> 1.4.8) - markerb (1.0.1) + markerb (1.0.2) redcarpet (>= 2.0) messagebus_ruby_api (1.0.3) method_source (0.8.2) mime-types (1.25.1) mini_magick (3.7.0) subexec (~> 0.2.1) - mini_portile (0.5.2) + mini_portile (0.6.0) mobile-fu (1.2.2) rack-mobile-detect rails - multi_json (1.10.0) - multi_test (0.0.3) + multi_json (1.10.1) + multi_test (0.1.1) + multi_xml (0.5.5) multipart-post (1.2.0) - mysql2 (0.3.14) + mysql2 (0.3.16) nested_form (0.3.2) - net-scp (1.1.2) + net-scp (1.2.1) net-ssh (>= 2.6.5) - net-ssh (2.7.0) - nokogiri (1.6.1) - mini_portile (~> 0.5.0) + net-ssh (2.9.1) + nokogiri (1.6.2.1) + mini_portile (= 0.6.0) oauth (0.4.7) - oauth2 (0.8.1) - faraday (~> 0.8) - httpauth (~> 0.1) - jwt (~> 0.1.4) - multi_json (~> 1.0) + oauth2 (0.9.4) + faraday (>= 0.8, < 0.10) + jwt (~> 1.0) + multi_json (~> 1.3) + multi_xml (~> 0.5) rack (~> 1.2) - omniauth (1.1.4) + omniauth (1.2.1) hashie (>= 1.2, < 3) - rack + rack (~> 1.0) omniauth-facebook (1.6.0) omniauth-oauth2 (~> 1.1) omniauth-oauth (1.0.1) oauth omniauth (~> 1.0) - omniauth-oauth2 (1.1.1) - oauth2 (~> 0.8.0) - omniauth (~> 1.0) + omniauth-oauth2 (1.1.2) + faraday (>= 0.8, < 0.10) + multi_json (~> 1.3) + oauth2 (~> 0.9.3) + omniauth (~> 1.2) omniauth-tumblr (1.1) omniauth-oauth (~> 1.0) omniauth-twitter (1.0.1) multi_json (~> 1.3) omniauth-oauth (~> 1.0) - omniauth-wordpress (0.2.0) + omniauth-wordpress (0.2.1) omniauth-oauth2 (~> 1.1.0) opengraph_parser (0.2.3) addressable nokogiri orm_adapter (0.5.0) - polyglot (0.3.4) - pry (0.9.12.4) + polyglot (0.3.5) + pry (0.9.12.6) coderay (~> 1.0) method_source (~> 0.8) slop (~> 3.4) rack (1.4.5) rack-cache (1.2) rack (>= 0.4) - rack-cors (0.2.8) - rack + rack-cors (0.2.9) rack-google-analytics (0.14.0) actionpack activesupport @@ -341,13 +354,14 @@ GEM rake (>= 0.8.7) rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) - raindrops (0.12.0) - rake (10.3.1) + raindrops (0.13.0) + rake (10.3.2) rb-fsevent (0.9.4) - rb-inotify (0.9.3) + rb-inotify (0.9.4) + ffi (>= 0.5.0) rdoc (3.12.2) json (~> 1.4) - redcarpet (3.1.1) + redcarpet (3.1.2) redis (3.0.6) redis-namespace (1.4.1) redis (~> 3.0.4) @@ -359,12 +373,12 @@ GEM rspec-core (~> 2.14.0) rspec-expectations (~> 2.14.0) rspec-mocks (~> 2.14.0) - rspec-core (2.14.7) - rspec-expectations (2.14.4) + rspec-core (2.14.8) + rspec-expectations (2.14.5) diff-lcs (>= 1.1.3, < 2.0) rspec-instafail (0.2.4) - rspec-mocks (2.14.4) - rspec-rails (2.14.1) + rspec-mocks (2.14.6) + rspec-rails (2.14.2) actionpack (>= 3.0) activemodel (>= 3.0) activesupport (>= 3.0) @@ -372,18 +386,17 @@ GEM rspec-core (~> 2.14.0) rspec-expectations (~> 2.14.0) rspec-mocks (~> 2.14.0) - ruby-hmac (0.4.0) ruby-oembed (0.8.9) - ruby-progressbar (1.4.0) - rubyzip (1.1.0) + ruby-progressbar (1.5.1) + rubyzip (1.1.4) safe_yaml (0.9.7) - sass (3.2.13) + sass (3.2.19) sass-rails (3.2.6) railties (~> 3.2.0) sass (>= 3.1.10) tilt (~> 1.3) - selenium-webdriver (2.39.0) - childprocess (>= 0.2.5) + selenium-webdriver (2.42.0) + childprocess (>= 0.5.0) multi_json (~> 1.0) rubyzip (~> 1.0) websocket (~> 1.0.4) @@ -398,25 +411,25 @@ GEM rack (~> 1.3, >= 1.3.6) rack-protection (~> 1.2) tilt (~> 1.3, >= 1.3.3) - sinon-rails (1.7.3) + sinon-rails (1.9.0) railties (>= 3.1) - slop (3.4.7) + slop (3.5.0) spork (1.0.0rc4) sprockets (2.2.2) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - strong_parameters (0.2.2) + strong_parameters (0.2.3) actionpack (~> 3.0) activemodel (~> 3.0) + activesupport (~> 3.0) railties (~> 3.0) subexec (0.2.3) systemu (2.5.2) - test_after_commit (0.2.2) + test_after_commit (0.2.3) thor (0.19.1) - thread_safe (0.1.3) - atomic + thread_safe (0.3.4) tilt (1.4.1) timecop (0.7.1) timers (1.1.0) @@ -427,13 +440,13 @@ GEM faraday (~> 0.8, < 0.10) multi_json (~> 1.0) simple_oauth (~> 0.2) - typhoeus (0.6.7) - ethon (~> 0.6.2) + typhoeus (0.6.8) + ethon (>= 0.7.0) tzinfo (0.3.39) - uglifier (2.1.2) + uglifier (2.5.0) execjs (>= 0.3.0) - multi_json (~> 1.0, >= 1.0.2) - unicorn (4.8.0) + json (>= 1.8.0) + unicorn (4.8.3) kgio (~> 2.6) rack raindrops (~> 0.7) @@ -441,14 +454,15 @@ GEM macaddr (~> 1.0) rack (>= 1.0) warden (1.2.3) - webmock (1.16.1) - addressable (>= 2.2.7) + rack (>= 1.0) + webmock (1.18.0) + addressable (>= 2.3.6) crack (>= 0.3.2) websocket (1.0.7) will_paginate (3.0.5) xpath (2.0.0) nokogiri (~> 1.3) - zip-zip (0.2) + zip-zip (0.3) rubyzip (>= 1.0.0) PLATFORMS @@ -458,31 +472,31 @@ DEPENDENCIES activerecord-import (= 0.3.1) acts-as-taggable-on (= 2.4.1) acts_as_api (= 0.4.2) - addressable (= 2.3.5) + addressable (= 2.3.6) asset_sync (= 1.0.0) - backbone-on-rails (= 1.1.0) + backbone-on-rails (= 1.1.1) bootstrap-sass (= 2.2.2.0) capybara (= 2.2.1) - carrierwave (= 0.9.0) - compass-rails (= 1.0.3) + carrierwave (= 0.10.0) + compass-rails (= 1.1.7) configurate (= 0.0.8) - cucumber-rails (= 1.4.0) - database_cleaner (= 1.2.0) - devise (= 3.2.2) + cucumber-rails (= 1.4.1) + database_cleaner (= 1.3.0) + devise (= 3.2.4) devise_lastseenable (= 0.0.4) - entypo-rails - factory_girl_rails (= 4.3.0) + entypo-rails (= 2.2.1) + factory_girl_rails (= 4.4.1) faraday (= 0.8.9) faraday_middleware (= 0.9.0) fixture_builder (= 0.3.6) - fog (= 1.19.0) + fog (= 1.22.1) foreigner (= 1.6.1) foreman (= 0.62) - fuubar (= 1.3.2) + fuubar (= 1.3.3) galetahub-simple_captcha (= 0.1.5) - gon (= 4.1.1) + gon (= 5.0.4) guard-cucumber (= 1.4.1) - guard-rspec (= 4.2.4) + guard-rspec (= 4.2.9) guard-spork (= 1.5.1) haml (= 4.0.5) handlebars_assets (= 0.12.0) @@ -491,19 +505,19 @@ DEPENDENCIES jasmine (= 1.3.2) jquery-rails (= 3.0.4) json (= 1.8.1) - markerb (= 1.0.1) + markerb (= 1.0.2) messagebus_ruby_api (= 1.0.3) mini_magick (= 3.7.0) mobile-fu (= 1.2.2) - mysql2 (= 0.3.14) - nokogiri (= 1.6.1) - omniauth (= 1.1.4) + mysql2 (= 0.3.16) + nokogiri (= 1.6.2.1) + omniauth (= 1.2.1) omniauth-facebook (= 1.6.0) omniauth-tumblr (= 1.1) omniauth-twitter (= 1.0.1) - omniauth-wordpress (= 0.2.0) + omniauth-wordpress (= 0.2.1) opengraph_parser (= 0.2.3) - rack-cors (= 0.2.8) + rack-cors (= 0.2.9) rack-google-analytics (= 0.14.0) rack-piwik (= 0.2.2) rack-protection (= 1.2) @@ -511,31 +525,31 @@ DEPENDENCIES rack-ssl (= 1.3.3) rails (= 3.2.18) rails-i18n (= 0.7.4) - rails-timeago + rails-timeago (= 2.4.0) rails_admin (= 0.4.9) rails_autolink (= 1.1.5) rb-fsevent (= 0.9.4) - rb-inotify (= 0.9.3) - redcarpet (= 3.1.1) + rb-inotify (= 0.9.4) + redcarpet (= 3.1.2) remotipart (= 1.2.1) roxml (= 3.1.6) rspec-instafail (= 0.2.4) - rspec-rails (= 2.14.1) + rspec-rails (= 2.14.2) ruby-oembed (= 0.8.9) sass-rails (= 3.2.6) - selenium-webdriver (= 2.39.0) + selenium-webdriver (= 2.42.0) sidekiq (= 2.17.2) sinatra (= 1.3.3) - sinon-rails (= 1.7.3) + sinon-rails (= 1.9.0) spork (= 1.0.0rc4) - strong_parameters - test_after_commit (= 0.2.2) + strong_parameters (= 0.2.3) + test_after_commit (= 0.2.3) timecop (= 0.7.1) twitter (= 4.8.1) - typhoeus (= 0.6.7) - uglifier (= 2.1.2) - unicorn (= 4.8.0) + typhoeus (= 0.6.8) + uglifier (= 2.5.0) + unicorn (= 4.8.3) uuid (= 2.3.7) - webmock (= 1.16.1) + webmock (= 1.18.0) will_paginate (= 3.0.5) zip-zip