diff --git a/Gemfile b/Gemfile index b3e2bbfc1..b6a75d8b6 100644 --- a/Gemfile +++ b/Gemfile @@ -9,7 +9,7 @@ gem 'unicorn', '4.6.2', :require => false # API and JSON gem 'acts_as_api', '0.4.1' -gem 'json', '1.7.7' +gem 'json', '1.8.0' # Authentication @@ -19,7 +19,7 @@ gem 'devise', '2.1.3' gem 'sidekiq', '2.11.1' gem 'sinatra', '1.3.3' -gem 'slim', '1.3.8' +gem 'slim', '1.3.9' # Configuration @@ -27,7 +27,7 @@ gem 'configurate', '0.0.8' # Cross-origin resource sharing -gem 'rack-cors', '0.2.7', :require => 'rack/cors' +gem 'rack-cors', '0.2.8', :require => 'rack/cors' # Database @@ -42,8 +42,8 @@ gem 'foreigner', '1.4.1' # File uploading gem 'carrierwave', '0.8.0' -gem 'fog', '1.10.1' -gem 'mini_magick', '3.5' +gem 'fog', '1.12.1' +gem 'mini_magick', '3.6.0' gem 'remotipart', '1.0.5' # Localization @@ -60,7 +60,7 @@ gem 'messagebus_ruby_api', '1.0.3' # Parsing gem 'nokogiri', '1.5.9' -gem 'rails_autolink', '1.0.9' +gem 'rails_autolink', '1.1.0' gem 'redcarpet', '2.3.0' gem 'roxml', '3.1.6' gem 'ruby-oembed', '0.8.8' @@ -71,11 +71,11 @@ 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.6.2' +gem 'twitter', '4.7.0' # Tags -gem 'acts-as-taggable-on', '2.4.0' +gem 'acts-as-taggable-on', '2.4.1' # URIs and HTTP @@ -87,9 +87,9 @@ gem 'typhoeus', '0.6.3' # Views gem 'client_side_validations', '3.2.5' -gem 'gon', '4.1.0' -gem 'haml', '4.0.2' -gem 'mobile-fu', '1.1.1' +gem 'gon', '4.1.1' +gem 'haml', '4.0.3' +gem 'mobile-fu', '1.2.1' gem 'will_paginate', '3.0.4' @@ -105,7 +105,7 @@ group :assets do # Compression - gem 'uglifier', '2.0.1' + gem 'uglifier', '2.1.1' # JavaScript @@ -124,7 +124,7 @@ group :production do # we don't install these on travis to speed up test runs # Administration - gem 'rails_admin', '0.4.7' + gem 'rails_admin', '0.4.9' # Analytics @@ -157,7 +157,7 @@ group :development do # Automatic test runs gem 'guard-cucumber', '1.4.0' - gem 'guard-rspec', '2.5.3' + gem 'guard-rspec', '3.0.1' gem 'rb-fsevent', '0.9.3', :require => false gem 'rb-inotify', '0.9.0', :require => false @@ -171,13 +171,13 @@ group :test do # RSpec (unit tests, some integration tests) gem 'fixture_builder', '0.3.5' - gem 'fuubar', '1.1.0' + gem 'fuubar', '1.1.1' gem 'rspec-instafail', '0.2.4', :require => false # Cucumber (integration tests) gem 'capybara', '1.1.3' - gem 'database_cleaner', '0.9.1' + gem 'database_cleaner', '1.0.1' gem 'selenium-webdriver', '2.32.1' # General helpers @@ -190,7 +190,7 @@ end group :development, :test do # RSpec (unit tests, some integration tests) - gem "rspec-rails", '2.13.0' + gem "rspec-rails", '2.13.2' # Cucumber (integration tests) gem 'cucumber-rails', '1.3.1', :require => false diff --git a/Gemfile.lock b/Gemfile.lock index 433923be1..c5aa293e6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -30,8 +30,8 @@ GEM activesupport (3.2.13) i18n (= 0.6.1) multi_json (~> 1.0) - acts-as-taggable-on (2.4.0) - rails (~> 3.0) + acts-as-taggable-on (2.4.1) + rails (>= 3, < 5) acts_as_api (0.4.1) activemodel (>= 3.0.0) activesupport (>= 3.0.0) @@ -77,29 +77,30 @@ GEM compass (>= 0.12.2, < 0.14) configurate (0.0.8) connection_pool (1.0.0) - crack (0.3.2) - cucumber (1.2.5) + crack (0.4.0) + safe_yaml (~> 0.9.0) + cucumber (1.3.2) builder (>= 2.1.2) diff-lcs (>= 1.1.3) - gherkin (~> 2.11.7) + gherkin (~> 2.12.0) multi_json (~> 1.3) cucumber-rails (1.3.1) capybara (>= 1.1.2) cucumber (>= 1.2.0) nokogiri (>= 1.5.0) rails (~> 3.0) - database_cleaner (0.9.1) + database_cleaner (1.0.1) devise (2.1.3) bcrypt-ruby (~> 3.0) orm_adapter (~> 0.1) railties (~> 3.1) warden (~> 1.2.1) - diff-lcs (1.2.3) + diff-lcs (1.2.4) erubis (2.7.0) ethon (0.5.12) ffi (>= 1.3.0) mime-types (~> 1.18) - excon (0.20.1) + excon (0.23.0) execjs (1.4.0) multi_json (~> 1.0) factory_girl (4.2.0) @@ -111,13 +112,13 @@ GEM multipart-post (~> 1.1) faraday_middleware (0.9.0) faraday (>= 0.7.4, < 0.9) - ffi (1.7.0) + ffi (1.9.0) fixture_builder (0.3.5) activerecord (>= 2) activesupport (>= 2) - fog (1.10.1) + fog (1.12.1) builder - excon (~> 0.20) + excon (~> 0.23.0) formatador (~> 0.2.0) mime-types multi_json (~> 1.0) @@ -125,48 +126,47 @@ GEM net-ssh (>= 2.1.3) nokogiri (~> 1.5.0) ruby-hmac - font-awesome-sass-rails (3.0.2.2) - railties (>= 3.1.1) - sass-rails (>= 3.1.1) + font-awesome-rails (3.1.1.3) + railties (>= 3.2, < 5.0) foreigner (1.4.1) activerecord (>= 3.0.0) foreman (0.62.0) thor (>= 0.13.6) formatador (0.2.4) fssm (0.2.10) - fuubar (1.1.0) + fuubar (1.1.1) rspec (~> 2.0) rspec-instafail (~> 0.2.0) - ruby-progressbar (~> 1.0.0) - gherkin (2.11.8) + ruby-progressbar (~> 1.0) + gherkin (2.12.0) multi_json (~> 1.3) - gon (4.1.0) + gon (4.1.1) actionpack (>= 2.3.0) json - guard (1.7.0) + guard (1.8.0) formatador (>= 0.2.4) - listen (>= 0.6.0) + listen (>= 1.0.0) lumberjack (>= 1.0.2) pry (>= 0.9.10) thor (>= 0.14.6) guard-cucumber (1.4.0) cucumber (>= 1.2.0) guard (>= 1.1.0) - guard-rspec (2.5.3) - guard (>= 1.1) - rspec (~> 2.11) + guard-rspec (3.0.1) + guard (>= 1.8) + rspec (~> 2.13) guard-spork (1.5.0) childprocess (>= 0.2.3) guard (>= 1.1) spork (>= 0.8.4) - haml (4.0.2) + haml (4.0.3) tilt handlebars_assets (0.12.0) execjs (>= 1.2.9) sprockets (>= 2.0.3) tilt - hashie (2.0.3) - hike (1.2.2) + hashie (2.0.5) + hike (1.2.3) http_accept_language (1.0.2) httpauth (0.2.0) i18n (0.6.1) @@ -189,17 +189,19 @@ GEM jquery-ui-rails (3.0.1) jquery-rails railties (>= 3.1.0) - json (1.7.7) + json (1.8.0) jwt (0.1.8) multi_json (>= 1.5) kaminari (0.14.1) actionpack (>= 3.0.0) activesupport (>= 3.0.0) kgio (2.8.0) - listen (0.7.3) + listen (1.2.0) + rb-fsevent (>= 0.9.3) + rb-inotify (>= 0.9) + rb-kqueue (>= 0.2) lumberjack (1.0.3) - mail (2.5.3) - i18n (>= 0.4.0) + mail (2.5.4) mime-types (~> 1.16) treetop (~> 1.4.8) markerb (1.0.1) @@ -207,16 +209,16 @@ GEM messagebus_ruby_api (1.0.3) method_source (0.8.1) mime-types (1.23) - mini_magick (3.5.0) + mini_magick (3.6.0) subexec (~> 0.2.1) - mobile-fu (1.1.1) + mobile-fu (1.2.1) rack-mobile-detect rails - multi_json (1.7.2) + multi_json (1.7.6) multipart-post (1.2.0) mysql2 (0.3.11) nested_form (0.3.2) - net-scp (1.1.0) + net-scp (1.1.1) net-ssh (>= 2.6.5) net-ssh (2.6.7) nokogiri (1.5.9) @@ -245,14 +247,14 @@ GEM omniauth-oauth (~> 1.0) orm_adapter (0.4.0) polyglot (0.3.3) - pry (0.9.12) + pry (0.9.12.2) coderay (~> 1.0.5) method_source (~> 0.8) slop (~> 3.4) rack (1.4.5) rack-cache (1.2) rack (>= 0.4) - rack-cors (0.2.7) + rack-cors (0.2.8) rack rack-google-analytics (0.11.0) rack-mobile-detect (0.4.0) @@ -278,13 +280,13 @@ GEM railties (= 3.2.13) rails-i18n (0.7.3) i18n (~> 0.5) - rails_admin (0.4.7) + rails_admin (0.4.9) bootstrap-sass (~> 2.2) builder (~> 3.0) - coffee-rails (~> 3.1) - font-awesome-sass-rails (~> 3.0, >= 3.0.0.1) + coffee-rails (>= 3.1, < 5) + font-awesome-rails (~> 3.0) haml (~> 4.0) - jquery-rails (~> 2.1) + jquery-rails (>= 2.1, < 4) jquery-ui-rails (~> 3.0) kaminari (~> 0.14) nested_form (~> 0.3) @@ -293,8 +295,8 @@ GEM remotipart (~> 1.0) safe_yaml (~> 0.6) sass-rails (~> 3.1) - rails_autolink (1.0.9) - rails (~> 3.1) + rails_autolink (1.1.0) + rails (> 3.1) railties (3.2.13) actionpack (= 3.2.13) activesupport (= 3.2.13) @@ -302,16 +304,18 @@ GEM rake (>= 0.8.7) rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) - raindrops (0.10.0) + raindrops (0.11.0) rake (10.0.4) rb-fsevent (0.9.3) rb-inotify (0.9.0) ffi (>= 0.5.0) + rb-kqueue (0.2.0) + ffi (>= 0.5.0) rdoc (3.12.2) json (~> 1.4) redcarpet (2.3.0) redis (3.0.4) - redis-namespace (1.2.1) + redis-namespace (1.3.0) redis (~> 3.0.0) remotipart (1.0.5) rmagick (2.13.2) @@ -327,7 +331,7 @@ GEM diff-lcs (>= 1.1.3, < 2.0) rspec-instafail (0.2.4) rspec-mocks (2.13.1) - rspec-rails (2.13.0) + rspec-rails (2.13.2) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) @@ -336,10 +340,10 @@ GEM rspec-mocks (~> 2.13.0) ruby-hmac (0.4.0) ruby-oembed (0.8.8) - ruby-progressbar (1.0.2) + ruby-progressbar (1.1.1) rubyzip (0.9.9) - safe_yaml (0.9.1) - sass (3.2.7) + safe_yaml (0.9.3) + sass (3.2.9) sass-rails (3.2.6) railties (~> 3.2.0) sass (>= 3.1.10) @@ -362,10 +366,10 @@ GEM tilt (~> 1.3, >= 1.3.3) sinon-rails (1.4.2.1) railties (>= 3.1) - slim (1.3.8) + slim (1.3.9) temple (~> 0.6.3) - tilt (~> 1.3.3) - slop (3.4.4) + tilt (~> 1.3, >= 1.3.3) + slop (3.4.5) spork (1.0.0rc3) sprockets (2.2.2) hike (~> 1.2) @@ -373,22 +377,22 @@ GEM rack (~> 1.0) tilt (~> 1.1, != 1.3.0) subexec (0.2.3) - temple (0.6.4) + temple (0.6.5) thor (0.18.1) - tilt (1.3.7) + tilt (1.4.1) timecop (0.6.1) timers (1.1.0) - treetop (1.4.12) + treetop (1.4.14) polyglot polyglot (>= 0.3.1) - twitter (4.6.2) + twitter (4.7.0) 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.0.1) + uglifier (2.1.1) execjs (>= 0.3.0) multi_json (~> 1.0, >= 1.0.2) unicorn (4.6.2) @@ -410,7 +414,7 @@ PLATFORMS DEPENDENCIES activerecord-import (= 0.3.1) - acts-as-taggable-on (= 2.4.0) + acts-as-taggable-on (= 2.4.1) acts_as_api (= 0.4.1) addressable (= 2.3.4) asset_sync (= 0.5.4) @@ -421,38 +425,38 @@ DEPENDENCIES compass-rails (= 1.0.3) configurate (= 0.0.8) cucumber-rails (= 1.3.1) - database_cleaner (= 0.9.1) + database_cleaner (= 1.0.1) devise (= 2.1.3) factory_girl_rails (= 4.2.1) faraday (= 0.8.7) faraday_middleware (= 0.9.0) fixture_builder (= 0.3.5) - fog (= 1.10.1) + fog (= 1.12.1) foreigner (= 1.4.1) foreman (= 0.62) - fuubar (= 1.1.0) - gon (= 4.1.0) + fuubar (= 1.1.1) + gon (= 4.1.1) guard-cucumber (= 1.4.0) - guard-rspec (= 2.5.3) + guard-rspec (= 3.0.1) guard-spork (= 1.5.0) - haml (= 4.0.2) + haml (= 4.0.3) handlebars_assets (= 0.12.0) http_accept_language (= 1.0.2) i18n-inflector-rails (~> 1.0) jasmine (= 1.3.2) jquery-rails (= 2.1.4) - json (= 1.7.7) + json (= 1.8.0) markerb (= 1.0.1) messagebus_ruby_api (= 1.0.3) - mini_magick (= 3.5) - mobile-fu (= 1.1.1) + mini_magick (= 3.6.0) + mobile-fu (= 1.2.1) mysql2 (= 0.3.11) nokogiri (= 1.5.9) omniauth (= 1.1.4) omniauth-facebook (= 1.4.1) omniauth-tumblr (= 1.1) omniauth-twitter (= 0.0.16) - rack-cors (= 0.2.7) + rack-cors (= 0.2.8) rack-google-analytics (= 0.11.0) rack-piwik (= 0.2.2) rack-protection (= 1.2) @@ -460,8 +464,8 @@ DEPENDENCIES rack-ssl (= 1.3.3) rails (= 3.2.13) rails-i18n (= 0.7.3) - rails_admin (= 0.4.7) - rails_autolink (= 1.0.9) + rails_admin (= 0.4.9) + rails_autolink (= 1.1.0) rb-fsevent (= 0.9.3) rb-inotify (= 0.9.0) redcarpet (= 2.3.0) @@ -469,19 +473,19 @@ DEPENDENCIES rmagick (= 2.13.2) roxml (= 3.1.6) rspec-instafail (= 0.2.4) - rspec-rails (= 2.13.0) + rspec-rails (= 2.13.2) ruby-oembed (= 0.8.8) sass-rails (= 3.2.6) selenium-webdriver (= 2.32.1) sidekiq (= 2.11.1) sinatra (= 1.3.3) sinon-rails (= 1.4.2.1) - slim (= 1.3.8) + slim (= 1.3.9) spork (= 1.0.0rc3) timecop (= 0.6.1) - twitter (= 4.6.2) + twitter (= 4.7.0) typhoeus (= 0.6.3) - uglifier (= 2.0.1) + uglifier (= 2.1.1) unicorn (= 4.6.2) webmock (= 1.11.0) will_paginate (= 3.0.4)