From 6467ee196244d7ba141b9426acb89393e7d312cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sat, 25 May 2013 15:03:12 +0200 Subject: [PATCH 01/23] bump acts-as-taggable-on --- Gemfile | 2 +- Gemfile.lock | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Gemfile b/Gemfile index b3e2bbfc1..082189b2d 100644 --- a/Gemfile +++ b/Gemfile @@ -75,7 +75,7 @@ gem 'twitter', '4.6.2' # Tags -gem 'acts-as-taggable-on', '2.4.0' +gem 'acts-as-taggable-on', '2.4.1' # URIs and HTTP diff --git a/Gemfile.lock b/Gemfile.lock index 433923be1..315d51c0f 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) @@ -198,8 +198,7 @@ GEM kgio (2.8.0) listen (0.7.3) 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) @@ -212,7 +211,7 @@ GEM mobile-fu (1.1.1) rack-mobile-detect rails - multi_json (1.7.2) + multi_json (1.7.3) multipart-post (1.2.0) mysql2 (0.3.11) nested_form (0.3.2) @@ -410,7 +409,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) From 3bdb078dfc503fa5db270bea169a1c088cd7d9e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sat, 25 May 2013 15:06:12 +0200 Subject: [PATCH 02/23] bump cucumber --- Gemfile.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 315d51c0f..fe360d42c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -78,10 +78,10 @@ GEM configurate (0.0.8) connection_pool (1.0.0) crack (0.3.2) - cucumber (1.2.5) + 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) @@ -94,7 +94,7 @@ GEM 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) @@ -138,7 +138,7 @@ GEM rspec (~> 2.0) rspec-instafail (~> 0.2.0) ruby-progressbar (~> 1.0.0) - gherkin (2.11.8) + gherkin (2.12.0) multi_json (~> 1.3) gon (4.1.0) actionpack (>= 2.3.0) From 0a127a9076c36d91d1211da5956ca349b4a5cd57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sat, 25 May 2013 15:10:00 +0200 Subject: [PATCH 03/23] bump database_cleaner --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 082189b2d..49598ef63 100644 --- a/Gemfile +++ b/Gemfile @@ -177,7 +177,7 @@ group :test do # 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 diff --git a/Gemfile.lock b/Gemfile.lock index fe360d42c..7fefb9fc9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -88,7 +88,7 @@ GEM 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) @@ -420,7 +420,7 @@ 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) From fc3da627fb99a3df6116bbdaed4a50b605922624 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sat, 25 May 2013 15:13:59 +0200 Subject: [PATCH 04/23] bump fog --- Gemfile | 2 +- Gemfile.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index 49598ef63..0dd8b5cf3 100644 --- a/Gemfile +++ b/Gemfile @@ -42,7 +42,7 @@ gem 'foreigner', '1.4.1' # File uploading gem 'carrierwave', '0.8.0' -gem 'fog', '1.10.1' +gem 'fog', '1.12.1' gem 'mini_magick', '3.5' gem 'remotipart', '1.0.5' diff --git a/Gemfile.lock b/Gemfile.lock index 7fefb9fc9..ab21a3fcc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -99,7 +99,7 @@ GEM 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) @@ -115,9 +115,9 @@ GEM 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) @@ -215,7 +215,7 @@ GEM 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) @@ -426,7 +426,7 @@ DEPENDENCIES 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) From 858f4475129d8a46b2c0767219556ec9f526f55f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sat, 25 May 2013 15:14:54 +0200 Subject: [PATCH 05/23] bump guard --- Gemfile | 2 +- Gemfile.lock | 23 ++++++++++++++--------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/Gemfile b/Gemfile index 0dd8b5cf3..0dc62db99 100644 --- a/Gemfile +++ b/Gemfile @@ -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 diff --git a/Gemfile.lock b/Gemfile.lock index ab21a3fcc..ab74c32b8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -143,18 +143,18 @@ GEM gon (4.1.0) 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) @@ -196,7 +196,10 @@ GEM 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.4) mime-types (~> 1.16) @@ -244,7 +247,7 @@ 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) @@ -306,6 +309,8 @@ GEM 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) @@ -364,7 +369,7 @@ GEM slim (1.3.8) temple (~> 0.6.3) tilt (~> 1.3.3) - slop (3.4.4) + slop (3.4.5) spork (1.0.0rc3) sprockets (2.2.2) hike (~> 1.2) @@ -432,7 +437,7 @@ DEPENDENCIES fuubar (= 1.1.0) gon (= 4.1.0) guard-cucumber (= 1.4.0) - guard-rspec (= 2.5.3) + guard-rspec (= 3.0.1) guard-spork (= 1.5.0) haml (= 4.0.2) handlebars_assets (= 0.12.0) From 061bca7ca58da90fba9bacb0b9a1f8092189a2a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sat, 25 May 2013 15:16:11 +0200 Subject: [PATCH 06/23] bump haml --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 0dc62db99..c74f2d132 100644 --- a/Gemfile +++ b/Gemfile @@ -88,7 +88,7 @@ gem 'typhoeus', '0.6.3' gem 'client_side_validations', '3.2.5' gem 'gon', '4.1.0' -gem 'haml', '4.0.2' +gem 'haml', '4.0.3' gem 'mobile-fu', '1.1.1' gem 'will_paginate', '3.0.4' diff --git a/Gemfile.lock b/Gemfile.lock index ab74c32b8..01327f4fc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -159,7 +159,7 @@ GEM 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) @@ -439,7 +439,7 @@ DEPENDENCIES guard-cucumber (= 1.4.0) 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) From d9b63b26ea51d0959bec63a7007ad6c07b96da99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sat, 25 May 2013 15:18:17 +0200 Subject: [PATCH 07/23] bump mini_magick --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index c74f2d132..99e4768f6 100644 --- a/Gemfile +++ b/Gemfile @@ -43,7 +43,7 @@ gem 'foreigner', '1.4.1' gem 'carrierwave', '0.8.0' gem 'fog', '1.12.1' -gem 'mini_magick', '3.5' +gem 'mini_magick', '3.6.0' gem 'remotipart', '1.0.5' # Localization diff --git a/Gemfile.lock b/Gemfile.lock index 01327f4fc..3e62b5631 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -209,7 +209,7 @@ 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) rack-mobile-detect @@ -448,7 +448,7 @@ DEPENDENCIES json (= 1.7.7) markerb (= 1.0.1) messagebus_ruby_api (= 1.0.3) - mini_magick (= 3.5) + mini_magick (= 3.6.0) mobile-fu (= 1.1.1) mysql2 (= 0.3.11) nokogiri (= 1.5.9) From d3953720a8e2e2889027d339a5b75cca035f49a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sat, 25 May 2013 15:19:57 +0200 Subject: [PATCH 08/23] bump rails_admin --- Gemfile | 2 +- Gemfile.lock | 21 ++++++++++----------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/Gemfile b/Gemfile index 99e4768f6..4f16cf6c4 100644 --- a/Gemfile +++ b/Gemfile @@ -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 diff --git a/Gemfile.lock b/Gemfile.lock index 3e62b5631..713601e5a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -125,9 +125,8 @@ 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) @@ -280,13 +279,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) @@ -342,8 +341,8 @@ GEM ruby-oembed (0.8.8) ruby-progressbar (1.0.2) 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) @@ -382,7 +381,7 @@ GEM tilt (1.3.7) 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) @@ -464,7 +463,7 @@ DEPENDENCIES rack-ssl (= 1.3.3) rails (= 3.2.13) rails-i18n (= 0.7.3) - rails_admin (= 0.4.7) + rails_admin (= 0.4.9) rails_autolink (= 1.0.9) rb-fsevent (= 0.9.3) rb-inotify (= 0.9.0) From 5859ceb5eae80c84cac9166d1cf0777815016453 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sat, 25 May 2013 15:28:07 +0200 Subject: [PATCH 09/23] bump rspec-rails --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 4f16cf6c4..fa6aeae76 100644 --- a/Gemfile +++ b/Gemfile @@ -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 713601e5a..ceb43d826 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -330,7 +330,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) @@ -472,7 +472,7 @@ 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) From c1635b34d62b08592d9952511b1215d75a07a339 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sat, 25 May 2013 15:29:28 +0200 Subject: [PATCH 10/23] bump slim --- Gemfile | 2 +- Gemfile.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index fa6aeae76..01f415b9a 100644 --- a/Gemfile +++ b/Gemfile @@ -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 diff --git a/Gemfile.lock b/Gemfile.lock index ceb43d826..c414d0b42 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -365,9 +365,9 @@ 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) + tilt (~> 1.3, >= 1.3.3) slop (3.4.5) spork (1.0.0rc3) sprockets (2.2.2) @@ -376,9 +376,9 @@ 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.14) @@ -479,7 +479,7 @@ DEPENDENCIES 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) From 06ca713d38a43a29e3e96ab515ba07185f7b87e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sat, 25 May 2013 15:30:25 +0200 Subject: [PATCH 11/23] bump uglifier --- Gemfile | 2 +- Gemfile.lock | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index 01f415b9a..dc2997650 100644 --- a/Gemfile +++ b/Gemfile @@ -105,7 +105,7 @@ group :assets do # Compression - gem 'uglifier', '2.0.1' + gem 'uglifier', '2.1.1' # JavaScript diff --git a/Gemfile.lock b/Gemfile.lock index c414d0b42..7c5e51fa4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -391,7 +391,7 @@ GEM 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) @@ -485,6 +485,7 @@ DEPENDENCIES twitter (= 4.6.2) 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) From 8bd78493a9b5e00dbc1a3c8b2b60245df1a38e15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sat, 25 May 2013 15:32:17 +0200 Subject: [PATCH 12/23] bump ffi --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 7c5e51fa4..75dd972dc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -111,7 +111,7 @@ 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) From 802656030f6c97ede3a3f95797e2acf69fd2b18f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sat, 25 May 2013 15:32:47 +0200 Subject: [PATCH 13/23] bump hashie --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 75dd972dc..ef9e26a2d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -164,7 +164,7 @@ GEM execjs (>= 1.2.9) sprockets (>= 2.0.3) tilt - hashie (2.0.3) + hashie (2.0.5) hike (1.2.2) http_accept_language (1.0.2) httpauth (0.2.0) From 277f07d41b1ce1e3e8e950ca6d9d2dfdd16acd16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sat, 25 May 2013 15:36:49 +0200 Subject: [PATCH 14/23] bump rails_autolink --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index dc2997650..2a8d33c42 100644 --- a/Gemfile +++ b/Gemfile @@ -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' diff --git a/Gemfile.lock b/Gemfile.lock index ef9e26a2d..69dca9b4a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -294,8 +294,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) @@ -464,7 +464,7 @@ DEPENDENCIES rails (= 3.2.13) rails-i18n (= 0.7.3) rails_admin (= 0.4.9) - rails_autolink (= 1.0.9) + rails_autolink (= 1.1.0) rb-fsevent (= 0.9.3) rb-inotify (= 0.9.0) redcarpet (= 2.3.0) From 5841793d78097bc36f6aa3da37630b6344a1e4f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sat, 25 May 2013 15:38:25 +0200 Subject: [PATCH 15/23] bump raindrops --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 69dca9b4a..ceebd4680 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -303,7 +303,7 @@ 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) From 31b310014108e290077f92b8f1d8324dacd0f669 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sat, 25 May 2013 15:39:28 +0200 Subject: [PATCH 16/23] bump redis-namespace --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index ceebd4680..5a8229944 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -314,7 +314,7 @@ GEM 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) From d3fe58407c59a20fa094157191bd440b987fdca4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sat, 25 May 2013 15:45:16 +0200 Subject: [PATCH 17/23] bump json --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 2a8d33c42..94f799526 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 diff --git a/Gemfile.lock b/Gemfile.lock index 5a8229944..cd74491d5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -188,7 +188,7 @@ 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) @@ -444,7 +444,7 @@ DEPENDENCIES 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.6.0) From b2b16ee3ab8484fbdbf8400b9bbc0921dc0744d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sun, 9 Jun 2013 14:00:36 +0200 Subject: [PATCH 18/23] bump gon --- Gemfile | 2 +- Gemfile.lock | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index 94f799526..d965f4192 100644 --- a/Gemfile +++ b/Gemfile @@ -87,7 +87,7 @@ gem 'typhoeus', '0.6.3' # Views gem 'client_side_validations', '3.2.5' -gem 'gon', '4.1.0' +gem 'gon', '4.1.1' gem 'haml', '4.0.3' gem 'mobile-fu', '1.1.1' gem 'will_paginate', '3.0.4' diff --git a/Gemfile.lock b/Gemfile.lock index cd74491d5..dd02c2716 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -139,7 +139,7 @@ GEM ruby-progressbar (~> 1.0.0) gherkin (2.12.0) multi_json (~> 1.3) - gon (4.1.0) + gon (4.1.1) actionpack (>= 2.3.0) json guard (1.8.0) @@ -165,7 +165,7 @@ GEM sprockets (>= 2.0.3) tilt hashie (2.0.5) - hike (1.2.2) + hike (1.2.3) http_accept_language (1.0.2) httpauth (0.2.0) i18n (0.6.1) @@ -213,7 +213,7 @@ GEM mobile-fu (1.1.1) rack-mobile-detect rails - multi_json (1.7.3) + multi_json (1.7.6) multipart-post (1.2.0) mysql2 (0.3.11) nested_form (0.3.2) @@ -434,7 +434,7 @@ DEPENDENCIES foreigner (= 1.4.1) foreman (= 0.62) fuubar (= 1.1.0) - gon (= 4.1.0) + gon (= 4.1.1) guard-cucumber (= 1.4.0) guard-rspec (= 3.0.1) guard-spork (= 1.5.0) @@ -484,7 +484,6 @@ DEPENDENCIES timecop (= 0.6.1) twitter (= 4.6.2) typhoeus (= 0.6.3) - uglifier (= 2.0.1) uglifier (= 2.1.1) unicorn (= 4.6.2) webmock (= 1.11.0) From 0786a3d6b7dcc5b33ad342c6fe29d6067e517e22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sun, 9 Jun 2013 14:04:41 +0200 Subject: [PATCH 19/23] bump mobile-fu --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index d965f4192..14acf3a22 100644 --- a/Gemfile +++ b/Gemfile @@ -89,7 +89,7 @@ gem 'typhoeus', '0.6.3' gem 'client_side_validations', '3.2.5' gem 'gon', '4.1.1' gem 'haml', '4.0.3' -gem 'mobile-fu', '1.1.1' +gem 'mobile-fu', '1.2.1' gem 'will_paginate', '3.0.4' diff --git a/Gemfile.lock b/Gemfile.lock index dd02c2716..9f742b49c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -210,7 +210,7 @@ GEM mime-types (1.23) 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.6) @@ -448,7 +448,7 @@ DEPENDENCIES markerb (= 1.0.1) messagebus_ruby_api (= 1.0.3) mini_magick (= 3.6.0) - mobile-fu (= 1.1.1) + mobile-fu (= 1.2.1) mysql2 (= 0.3.11) nokogiri (= 1.5.9) omniauth (= 1.1.4) From 7323c9c0fc0e27df838782515e7b4704452589f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sun, 9 Jun 2013 14:07:13 +0200 Subject: [PATCH 20/23] bump twitter --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 14acf3a22..eb098ab66 100644 --- a/Gemfile +++ b/Gemfile @@ -71,7 +71,7 @@ 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 diff --git a/Gemfile.lock b/Gemfile.lock index 9f742b49c..0840a5e8d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -384,7 +384,7 @@ GEM 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) @@ -482,7 +482,7 @@ DEPENDENCIES 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.1.1) unicorn (= 4.6.2) From 178b92d8ad92c060ff17ddcbb480fe9186ca403e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sun, 9 Jun 2013 14:11:16 +0200 Subject: [PATCH 21/23] bump rack-cors --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index eb098ab66..7b688cb16 100644 --- a/Gemfile +++ b/Gemfile @@ -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 diff --git a/Gemfile.lock b/Gemfile.lock index 0840a5e8d..d1d9c0ae0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -253,7 +253,7 @@ GEM 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) @@ -455,7 +455,7 @@ DEPENDENCIES 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) From 6720f6b3f76d046f2580676ef5fb6a985ec62911 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sun, 9 Jun 2013 14:17:30 +0200 Subject: [PATCH 22/23] bump fuubar --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 7b688cb16..b6a75d8b6 100644 --- a/Gemfile +++ b/Gemfile @@ -171,7 +171,7 @@ 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) diff --git a/Gemfile.lock b/Gemfile.lock index d1d9c0ae0..9ac53c779 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -133,10 +133,10 @@ GEM 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) + ruby-progressbar (~> 1.0) gherkin (2.12.0) multi_json (~> 1.3) gon (4.1.1) @@ -339,7 +339,7 @@ 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.3) sass (3.2.9) @@ -433,7 +433,7 @@ DEPENDENCIES fog (= 1.12.1) foreigner (= 1.4.1) foreman (= 0.62) - fuubar (= 1.1.0) + fuubar (= 1.1.1) gon (= 4.1.1) guard-cucumber (= 1.4.0) guard-rspec (= 3.0.1) From 339dba1aeb01be7bedc28e872e4ee9a99eed14da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Tue, 11 Jun 2013 22:41:54 +0200 Subject: [PATCH 23/23] bump crack --- Gemfile.lock | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 9ac53c779..c5aa293e6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -77,7 +77,8 @@ GEM compass (>= 0.12.2, < 0.14) configurate (0.0.8) connection_pool (1.0.0) - crack (0.3.2) + crack (0.4.0) + safe_yaml (~> 0.9.0) cucumber (1.3.2) builder (>= 2.1.2) diff-lcs (>= 1.1.3)