From bcd3cf1c77254341a94b44aaa2fb09571a5d58db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 27 Jul 2015 13:28:14 +0200 Subject: [PATCH 01/20] bump activerecord-import --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index d64ac265f..652c63d88 100644 --- a/Gemfile +++ b/Gemfile @@ -65,7 +65,7 @@ ENV["DB"] ||= "mysql" gem "mysql2", "0.3.18" if ENV["DB"] == "all" || ENV["DB"] == "mysql" gem "pg", "0.18.2" if ENV["DB"] == "all" || ENV["DB"] == "postgres" -gem "activerecord-import", "0.8.0" +gem "activerecord-import", "0.10.0" # File uploading diff --git a/Gemfile.lock b/Gemfile.lock index 0dca4125c..498ebd7d2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -34,7 +34,7 @@ GEM activemodel (= 4.2.3) activesupport (= 4.2.3) arel (~> 6.0) - activerecord-import (0.8.0) + activerecord-import (0.10.0) activerecord (>= 3.0) activesupport (4.2.3) i18n (~> 0.7) @@ -49,7 +49,7 @@ GEM activesupport (>= 3.0.0) rack (>= 1.1.0) addressable (2.3.8) - arel (6.0.0) + arel (6.0.2) asset_sync (1.1.0) activemodel fog (>= 1.8.0) @@ -746,7 +746,7 @@ PLATFORMS DEPENDENCIES active_model_serializers (= 0.9.3) - activerecord-import (= 0.8.0) + activerecord-import (= 0.10.0) acts-as-taggable-on (= 3.5.0) acts_as_api (= 0.4.2) addressable (= 2.3.8) From dd1349f69bc2579ad9c12f02ce0432227ecf5195 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 27 Jul 2015 13:28:54 +0200 Subject: [PATCH 02/20] bump autoprefixer-rails --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 652c63d88..228c04012 100644 --- a/Gemfile +++ b/Gemfile @@ -56,7 +56,7 @@ gem "rack-cors", "0.4.0", require: "rack/cors" gem "bootstrap-sass", "2.3.2.2" gem "compass-rails", "2.0.4" gem "sass-rails", "5.0.1" -gem "autoprefixer-rails", "5.2.1" +gem "autoprefixer-rails", "5.2.1.1" # Database diff --git a/Gemfile.lock b/Gemfile.lock index 498ebd7d2..9b9e96d6a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -57,7 +57,7 @@ GEM ast (2.0.0) astrolabe (1.3.0) parser (>= 2.2.0.pre.3, < 3.0) - autoprefixer-rails (5.2.1) + autoprefixer-rails (5.2.1.1) execjs json backbone-on-rails (1.2.0.0) @@ -751,7 +751,7 @@ DEPENDENCIES acts_as_api (= 0.4.2) addressable (= 2.3.8) asset_sync (= 1.1.0) - autoprefixer-rails (= 5.2.1) + autoprefixer-rails (= 5.2.1.1) backbone-on-rails (= 1.2.0.0) bootstrap-sass (= 2.3.2.2) capybara (= 2.4.4) From 41ef70202eb1f4a40990b72f06366fbf5d0cbbe5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 27 Jul 2015 13:30:02 +0200 Subject: [PATCH 03/20] bump faraday_middleware --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 228c04012..ee3392de5 100644 --- a/Gemfile +++ b/Gemfile @@ -158,7 +158,7 @@ gem "acts-as-taggable-on", "3.5.0" gem "addressable", "2.3.8", require: "addressable/uri" gem "faraday", "0.9.1" -gem "faraday_middleware", "0.9.1" +gem "faraday_middleware", "0.10.0" gem "faraday-cookie_jar", "0.0.6" gem "typhoeus", "0.7.2" diff --git a/Gemfile.lock b/Gemfile.lock index 9b9e96d6a..08a9e635e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -199,7 +199,7 @@ GEM faraday-cookie_jar (0.0.6) faraday (>= 0.7.4) http-cookie (~> 1.0.0) - faraday_middleware (0.9.1) + faraday_middleware (0.10.0) faraday (>= 0.7.4, < 0.10) ffi (1.9.8) fission (0.5.0) @@ -771,7 +771,7 @@ DEPENDENCIES factory_girl_rails (= 4.5.0) faraday (= 0.9.1) faraday-cookie_jar (= 0.0.6) - faraday_middleware (= 0.9.1) + faraday_middleware (= 0.10.0) fixture_builder (= 0.4.1) fog (= 1.31.0) fuubar (= 2.0.0) From 3506e925944f88fba5838f63aaf3aacac9501560 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 27 Jul 2015 13:30:31 +0200 Subject: [PATCH 04/20] bump fog --- Gemfile | 2 +- Gemfile.lock | 26 +++++++++++++------------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Gemfile b/Gemfile index ee3392de5..7a803c284 100644 --- a/Gemfile +++ b/Gemfile @@ -70,7 +70,7 @@ gem "activerecord-import", "0.10.0" # File uploading gem "carrierwave", "0.10.0" -gem "fog", "1.31.0" +gem "fog", "1.32.0" gem "mini_magick", "4.2.7" gem "remotipart", "1.2.1" diff --git a/Gemfile.lock b/Gemfile.lock index 08a9e635e..ff5236008 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -178,7 +178,7 @@ GEM ethon (0.7.4) ffi (>= 1.3.0) eventmachine (1.0.7) - excon (0.45.3) + excon (0.45.4) execjs (2.5.2) eye (0.7.pre) celluloid (~> 0.16.0) @@ -207,12 +207,12 @@ GEM fixture_builder (0.4.1) activerecord (>= 2) activesupport (>= 2) - fog (1.31.0) + fog (1.32.0) fog-atmos - fog-aws (~> 0.0) + fog-aws (>= 0.6.0) fog-brightbox (~> 0.4) - fog-core (~> 1.30) - fog-ecloud + fog-core (~> 1.32) + fog-ecloud (= 0.1.1) fog-google (>= 0.0.2) fog-json fog-local @@ -233,26 +233,26 @@ GEM fog-atmos (0.1.0) fog-core fog-xml - fog-aws (0.5.0) + fog-aws (0.7.3) fog-core (~> 1.27) fog-json (~> 1.0) fog-xml (~> 0.1) ipaddress (~> 0.8) - fog-brightbox (0.7.1) + fog-brightbox (0.8.0) fog-core (~> 1.22) fog-json inflecto (~> 0.0.2) - fog-core (1.31.1) + fog-core (1.32.0) builder excon (~> 0.45) formatador (~> 0.2) mime-types net-scp (~> 1.1) net-ssh (>= 2.1.3) - fog-ecloud (0.1.3) + fog-ecloud (0.1.1) fog-core fog-xml - fog-google (0.0.5) + fog-google (0.0.7) fog-core fog-json fog-xml @@ -265,7 +265,7 @@ GEM fog-core (~> 1.27) fog-json (~> 1.0) fog-xml (~> 0.1) - fog-profitbricks (0.0.3) + fog-profitbricks (0.0.5) fog-core fog-xml nokogiri @@ -283,7 +283,7 @@ GEM fog-serverlove (0.1.2) fog-core fog-json - fog-softlayer (0.4.6) + fog-softlayer (0.4.7) fog-core fog-json fog-storm_on_demand (0.1.1) @@ -773,7 +773,7 @@ DEPENDENCIES faraday-cookie_jar (= 0.0.6) faraday_middleware (= 0.10.0) fixture_builder (= 0.4.1) - fog (= 1.31.0) + fog (= 1.32.0) fuubar (= 2.0.0) gon (= 5.2.3) guard (= 2.12.5) From 5fc465155ba1cdf1a55ea9aeba2993a5ea00f0e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 27 Jul 2015 13:34:06 +0200 Subject: [PATCH 05/20] bump rails-assets-perfect-scrollbar --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 7a803c284..e4196c585 100644 --- a/Gemfile +++ b/Gemfile @@ -107,7 +107,7 @@ source "https://rails-assets.org" do gem "rails-assets-jeresig--jquery.hotkeys", "0.2.0" gem "rails-assets-jquery-placeholder", "2.1.2" gem "rails-assets-jquery-textchange", "0.2.3" - gem "rails-assets-perfect-scrollbar", "0.6.3" + gem "rails-assets-perfect-scrollbar", "0.6.4" gem "rails-assets-jakobmattsson--jquery-elastic", "1.6.11" end diff --git a/Gemfile.lock b/Gemfile.lock index ff5236008..b7f278d2f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -553,7 +553,7 @@ GEM rails-assets-markdown-it-sanitizer (0.3.1) rails-assets-markdown-it-sub (1.0.0) rails-assets-markdown-it-sup (1.0.0) - rails-assets-perfect-scrollbar (0.6.3) + rails-assets-perfect-scrollbar (0.6.4) rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) rails-dom-testing (1.0.6) @@ -836,7 +836,7 @@ DEPENDENCIES rails-assets-markdown-it-sanitizer (= 0.3.1)! rails-assets-markdown-it-sub (= 1.0.0)! rails-assets-markdown-it-sup (= 1.0.0)! - rails-assets-perfect-scrollbar (= 0.6.3)! + rails-assets-perfect-scrollbar (= 0.6.4)! rails-i18n (= 4.0.4) rails-timeago (= 2.11.0) rails_admin (= 0.6.8) From f64f5ac72e478b8fdff3ee74e6bb751687e10a43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 27 Jul 2015 13:34:38 +0200 Subject: [PATCH 06/20] bump rspec-rails --- Gemfile | 2 +- Gemfile.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index e4196c585..770c18215 100644 --- a/Gemfile +++ b/Gemfile @@ -278,7 +278,7 @@ end group :development, :test do # RSpec (unit tests, some integration tests) - gem "rspec-rails", "3.3.2" + gem "rspec-rails", "3.3.3" # Cucumber (integration tests) gem "cucumber-rails", "1.4.2", require: false diff --git a/Gemfile.lock b/Gemfile.lock index b7f278d2f..3dff8bd49 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -608,17 +608,17 @@ GEM rspec-core (~> 3.3.0) rspec-expectations (~> 3.3.0) rspec-mocks (~> 3.3.0) - rspec-core (3.3.1) + rspec-core (3.3.2) rspec-support (~> 3.3.0) - rspec-expectations (3.3.0) + rspec-expectations (3.3.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.3.0) rspec-instafail (0.2.6) rspec - rspec-mocks (3.3.1) + rspec-mocks (3.3.2) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.3.0) - rspec-rails (3.3.2) + rspec-rails (3.3.3) actionpack (>= 3.0, < 4.3) activesupport (>= 3.0, < 4.3) railties (>= 3.0, < 4.3) @@ -847,7 +847,7 @@ DEPENDENCIES responders (= 2.1.0) roxml (= 3.1.6) rspec-instafail (= 0.2.6) - rspec-rails (= 3.3.2) + rspec-rails (= 3.3.3) rubocop (= 0.32.0) ruby-oembed (= 0.8.14) rubyzip (= 1.1.7) From 2ceef872bd3391094b927fa53922ab3a104ee055 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 27 Jul 2015 13:35:12 +0200 Subject: [PATCH 07/20] bump rubocop --- Gemfile | 2 +- Gemfile.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index 770c18215..4c81ee5ea 100644 --- a/Gemfile +++ b/Gemfile @@ -232,7 +232,7 @@ group :development do # Linters gem "jshintrb", "0.3.0" - gem "rubocop", "0.32.0" + gem "rubocop", "0.32.1" # Preloading environment diff --git a/Gemfile.lock b/Gemfile.lock index 3dff8bd49..ed994266c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -55,8 +55,8 @@ GEM fog (>= 1.8.0) unf ast (2.0.0) - astrolabe (1.3.0) - parser (>= 2.2.0.pre.3, < 3.0) + astrolabe (1.3.1) + parser (~> 2.2) autoprefixer-rails (5.2.1.1) execjs json @@ -473,7 +473,7 @@ GEM faraday (~> 0.9.0) nokogiri (~> 1.6) orm_adapter (0.5.0) - parser (2.2.2.5) + parser (2.2.2.6) ast (>= 1.1, < 3.0) phantomjs (1.9.8.0) powerpack (0.1.1) @@ -627,7 +627,7 @@ GEM rspec-mocks (~> 3.3.0) rspec-support (~> 3.3.0) rspec-support (3.3.0) - rubocop (0.32.0) + rubocop (0.32.1) astrolabe (~> 1.3) parser (>= 2.2.2.5, < 3.0) powerpack (~> 0.1) @@ -848,7 +848,7 @@ DEPENDENCIES roxml (= 3.1.6) rspec-instafail (= 0.2.6) rspec-rails (= 3.3.3) - rubocop (= 0.32.0) + rubocop (= 0.32.1) ruby-oembed (= 0.8.14) rubyzip (= 1.1.7) sass-rails (= 5.0.1) From 60422477665e6706e17d1bbf889916b7ed43f395 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 27 Jul 2015 13:36:51 +0200 Subject: [PATCH 08/20] bump sidekiq --- Gemfile | 2 +- Gemfile.lock | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Gemfile b/Gemfile index 4c81ee5ea..bf9b7ee7f 100644 --- a/Gemfile +++ b/Gemfile @@ -32,7 +32,7 @@ gem "simple_captcha2", "0.3.4", require: "simple_captcha" # Background processing -gem "sidekiq", "3.4.1" +gem "sidekiq", "3.4.2" gem "sinatra", "1.4.6" # Scheduled processing diff --git a/Gemfile.lock b/Gemfile.lock index ed994266c..55d820320 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -652,12 +652,12 @@ GEM shellany (0.0.1) shoulda-matchers (2.8.0) activesupport (>= 3.0.0) - sidekiq (3.4.1) + sidekiq (3.4.2) celluloid (~> 0.16.0) - connection_pool (>= 2.1.1) - json - redis (>= 3.0.6) - redis-namespace (>= 1.3.1) + connection_pool (~> 2.2, >= 2.2.0) + json (~> 1.0) + redis (~> 3.2, >= 3.2.1) + redis-namespace (~> 1.5, >= 1.5.2) sidetiq (0.6.3) celluloid (>= 0.14.1) ice_cube (= 0.11.1) @@ -854,7 +854,7 @@ DEPENDENCIES sass-rails (= 5.0.1) selenium-webdriver (= 2.45.0) shoulda-matchers (= 2.8.0) - sidekiq (= 3.4.1) + sidekiq (= 3.4.2) sidetiq (= 0.6.3) simple_captcha2 (= 0.3.4) simplecov (= 0.10.0) From abb42ec2a1a98b986cb86962b1b74025931fc16e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 27 Jul 2015 13:37:45 +0200 Subject: [PATCH 09/20] bump guard --- Gemfile | 4 ++-- Gemfile.lock | 17 ++++++++--------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/Gemfile b/Gemfile index bf9b7ee7f..0b24830a4 100644 --- a/Gemfile +++ b/Gemfile @@ -224,9 +224,9 @@ group :development do # Automatic test runs gem "guard-cucumber", "1.5.4" gem "guard-jshintrb", "1.1.1" - gem "guard-rspec", "4.5.2" + gem "guard-rspec", "4.6.3" gem "guard-rubocop", "1.2.0" - gem "guard", "2.12.5", require: false + gem "guard", "2.13.0", require: false gem "rb-fsevent", "0.9.5", require: false gem "rb-inotify", "0.9.5", require: false diff --git a/Gemfile.lock b/Gemfile.lock index 55d820320..71641b064 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -201,7 +201,7 @@ GEM http-cookie (~> 1.0.0) faraday_middleware (0.10.0) faraday (>= 0.7.4, < 0.10) - ffi (1.9.8) + ffi (1.9.10) fission (0.5.0) CFPropertyList (~> 2.2) fixture_builder (0.4.1) @@ -316,9 +316,9 @@ GEM json multi_json request_store (>= 1.0.5) - guard (2.12.5) + guard (2.13.0) formatador (>= 0.2.4) - listen (~> 2.7) + listen (>= 2.7, <= 4.0) lumberjack (~> 1.0) nenv (~> 0.1) notiffany (~> 0.0) @@ -333,7 +333,7 @@ GEM guard-jshintrb (1.1.1) guard (~> 2.0) jshintrb - guard-rspec (4.5.2) + guard-rspec (4.6.3) guard (~> 2.1) guard-compat (~> 1.1) rspec (>= 2.99.0, < 4.0) @@ -397,8 +397,7 @@ GEM actionpack (>= 3.0.0) activesupport (>= 3.0.0) kgio (2.9.3) - listen (2.10.1) - celluloid (~> 0.16.0) + listen (3.0.3) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) little-plugger (1.1.3) @@ -441,7 +440,7 @@ GEM nio4r (1.1.0) nokogiri (1.6.6.2) mini_portile (~> 0.6.0) - notiffany (0.0.6) + notiffany (0.0.7) nenv (~> 0.1) shellany (~> 0.0) oauth (0.4.7) @@ -776,10 +775,10 @@ DEPENDENCIES fog (= 1.32.0) fuubar (= 2.0.0) gon (= 5.2.3) - guard (= 2.12.5) + guard (= 2.13.0) guard-cucumber (= 1.5.4) guard-jshintrb (= 1.1.1) - guard-rspec (= 4.5.2) + guard-rspec (= 4.6.3) guard-rubocop (= 1.2.0) haml (= 4.0.6) handlebars_assets (= 0.20.2) From d17c1e322003bb7d9ee877c1f22687d324490f59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 27 Jul 2015 13:46:56 +0200 Subject: [PATCH 10/20] bump jwt --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 71641b064..c25245de9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -392,7 +392,7 @@ GEM json (1.8.3) json-schema (2.5.1) addressable (~> 2.3.7) - jwt (1.5.0) + jwt (1.5.1) kaminari (0.16.3) actionpack (>= 3.0.0) activesupport (>= 3.0.0) From 452fcab554ac2c48aee281a150c70d9013004733 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 27 Jul 2015 13:47:34 +0200 Subject: [PATCH 11/20] bump raindrops --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index c25245de9..a77646922 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -587,7 +587,7 @@ GEM rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rainbow (2.0.0) - raindrops (0.13.0) + raindrops (0.15.0) rake (10.4.2) rb-fsevent (0.9.5) rb-inotify (0.9.5) From a713cc606697246c15cf637134219fac6414f6d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 27 Jul 2015 13:48:36 +0200 Subject: [PATCH 12/20] bump nio4r --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index a77646922..9c916f48b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -437,7 +437,7 @@ GEM net-scp (1.2.1) net-ssh (>= 2.6.5) net-ssh (2.9.2) - nio4r (1.1.0) + nio4r (1.1.1) nokogiri (1.6.6.2) mini_portile (~> 0.6.0) notiffany (0.0.7) From 8f0ca722c8105e09b1933d054b6bf2d6a0097d2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 27 Jul 2015 13:49:02 +0200 Subject: [PATCH 13/20] bump omniauth-oauth2 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 9c916f48b..17e0e23b7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -458,7 +458,7 @@ GEM omniauth-oauth (1.1.0) oauth omniauth (~> 1.0) - omniauth-oauth2 (1.3.0) + omniauth-oauth2 (1.3.1) oauth2 (~> 1.0) omniauth (~> 1.2) omniauth-tumblr (1.1) From 3be5acef8cc12eb2d90e275a12da69bec4fd95e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 27 Jul 2015 13:49:22 +0200 Subject: [PATCH 14/20] bump request_store --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 17e0e23b7..d9d5918db 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -597,7 +597,7 @@ GEM redis-namespace (1.5.2) redis (~> 3.0, >= 3.0.4) remotipart (1.2.1) - request_store (1.1.0) + request_store (1.2.0) responders (2.1.0) railties (>= 4.2.0, < 5) roxml (3.1.6) From b6a83415b04951ecf7be77e9e8ee646dcd117b98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 27 Jul 2015 13:49:52 +0200 Subject: [PATCH 15/20] bump sass --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index d9d5918db..4e6bc17b0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -636,7 +636,7 @@ GEM ruby-progressbar (1.7.5) rubyzip (1.1.7) safe_yaml (1.0.4) - sass (3.4.13) + sass (3.4.16) sass-rails (5.0.1) railties (>= 4.0.0, < 5.0) sass (~> 3.1) From 7f0d178092f8c27ee0347dcda0bce96f748e7a06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 27 Jul 2015 14:16:17 +0200 Subject: [PATCH 16/20] bump selenium-webdriver --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 0b24830a4..e3d7c132e 100644 --- a/Gemfile +++ b/Gemfile @@ -261,7 +261,7 @@ group :test do gem "capybara", "2.4.4" gem "database_cleaner" , "1.4.1" - gem "selenium-webdriver", "2.45.0" + gem "selenium-webdriver", "2.46.2" source "https://rails-assets.org" do gem "rails-assets-jquery-simulate", "1.0.1" diff --git a/Gemfile.lock b/Gemfile.lock index 4e6bc17b0..cce2526d9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -426,7 +426,7 @@ GEM mobile-fu (1.3.1) rack-mobile-detect rails - multi_json (1.11.1) + multi_json (1.11.2) multi_test (0.1.2) multi_xml (0.5.5) multipart-post (2.0.0) @@ -643,7 +643,7 @@ GEM sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (~> 1.1) - selenium-webdriver (2.45.0) + selenium-webdriver (2.46.2) childprocess (~> 0.5) multi_json (~> 1.0) rubyzip (~> 1.0) @@ -851,7 +851,7 @@ DEPENDENCIES ruby-oembed (= 0.8.14) rubyzip (= 1.1.7) sass-rails (= 5.0.1) - selenium-webdriver (= 2.45.0) + selenium-webdriver (= 2.46.2) shoulda-matchers (= 2.8.0) sidekiq (= 3.4.2) sidetiq (= 0.6.3) From 2280edaa85c909673d161ae6fc1fe24dd29ae360 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 27 Jul 2015 15:59:43 +0200 Subject: [PATCH 17/20] bump devise_lastseenable --- Gemfile | 2 +- Gemfile.lock | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index e3d7c132e..5bb5dec60 100644 --- a/Gemfile +++ b/Gemfile @@ -23,7 +23,7 @@ gem "json-schema", "2.5.1" # Authentication gem "devise", "3.5.1" -gem "devise_lastseenable", "0.0.4" +gem "devise_lastseenable", "0.0.6" gem "devise-token_authenticatable", "~> 0.4.0" # Captcha diff --git a/Gemfile.lock b/Gemfile.lock index cce2526d9..b56d9330f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -142,10 +142,9 @@ GEM warden (~> 1.2.3) devise-token_authenticatable (0.4.0) devise (~> 3.5.0) - devise_lastseenable (0.0.4) + devise_lastseenable (0.0.6) devise rails (>= 3.0.4) - warden diaspora-vines (0.1.27) activerecord (~> 4.1) bcrypt (~> 3.1) @@ -682,7 +681,7 @@ GEM spring (>= 0.9.1) spring-commands-rspec (1.0.4) spring (>= 0.9.1) - sprockets (2.12.3) + sprockets (2.12.4) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) @@ -761,7 +760,7 @@ DEPENDENCIES database_cleaner (= 1.4.1) devise (= 3.5.1) devise-token_authenticatable (~> 0.4.0) - devise_lastseenable (= 0.0.4) + devise_lastseenable (= 0.0.6) diaspora-vines (~> 0.1.27) diaspora_federation-rails (= 0.0.3) entypo-rails (= 2.2.3) From 3f39555223c25ed2cf33b605234fcb41dd0f5e81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Wed, 29 Jul 2015 10:13:13 +0200 Subject: [PATCH 18/20] bump gon --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 5bb5dec60..4f2dec71d 100644 --- a/Gemfile +++ b/Gemfile @@ -164,7 +164,7 @@ gem "typhoeus", "0.7.2" # Views -gem "gon", "5.2.3" +gem "gon", "6.0.1" gem "haml", "4.0.6" gem "mobile-fu", "1.3.1" gem "will_paginate", "3.0.7" diff --git a/Gemfile.lock b/Gemfile.lock index b56d9330f..74bbeeb04 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -310,11 +310,11 @@ GEM multi_json (~> 1.3) globalid (0.3.5) activesupport (>= 4.1.0) - gon (5.2.3) - actionpack (>= 2.3.0) + gon (6.0.1) + actionpack (>= 3.0) json multi_json - request_store (>= 1.0.5) + request_store (>= 1.0) guard (2.13.0) formatador (>= 0.2.4) listen (>= 2.7, <= 4.0) @@ -773,7 +773,7 @@ DEPENDENCIES fixture_builder (= 0.4.1) fog (= 1.32.0) fuubar (= 2.0.0) - gon (= 5.2.3) + gon (= 6.0.1) guard (= 2.13.0) guard-cucumber (= 1.5.4) guard-jshintrb (= 1.1.1) From f5062583248ec6df323463fb32c853205849d73c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Wed, 29 Jul 2015 10:15:07 +0200 Subject: [PATCH 19/20] bump timecop --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 4f2dec71d..1f74d83d4 100644 --- a/Gemfile +++ b/Gemfile @@ -271,7 +271,7 @@ group :test do # General helpers gem "factory_girl_rails", "4.5.0" - gem "timecop", "0.7.4" + gem "timecop", "0.8.0" gem "webmock", "1.21.0", require: false gem "shoulda-matchers", "2.8.0", require: false end diff --git a/Gemfile.lock b/Gemfile.lock index 74bbeeb04..37d0990f0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -697,7 +697,7 @@ GEM thor (0.19.1) thread_safe (0.3.5) tilt (1.4.1) - timecop (0.7.4) + timecop (0.8.0) timers (4.0.1) hitimes twitter (5.14.0) @@ -862,7 +862,7 @@ DEPENDENCIES spring-commands-cucumber (= 1.0.1) spring-commands-rspec (= 1.0.4) test_after_commit (= 0.4.1) - timecop (= 0.7.4) + timecop (= 0.8.0) twitter (= 5.14.0) twitter-text (= 1.12.0) typhoeus (= 0.7.2) From ed463750b128d1a86f52568e62d0b1ea036047bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Wed, 29 Jul 2015 10:16:00 +0200 Subject: [PATCH 20/20] bump font-awesome-rails --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 37d0990f0..24d5157e1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -300,7 +300,7 @@ GEM fog-xml (0.1.2) fog-core nokogiri (~> 1.5, >= 1.5.11) - font-awesome-rails (4.3.0.0) + font-awesome-rails (4.4.0.0) railties (>= 3.2, < 5.0) formatador (0.2.5) fuubar (2.0.0)