From f95ccdf97985fb73591c68b1bd7048a8200fe14c Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Thu, 12 May 2016 01:40:53 +0200 Subject: [PATCH 01/51] Bump rails --- Gemfile | 2 +- Gemfile.lock | 74 +++++++++++++++++++++++++++------------------------- 2 files changed, 39 insertions(+), 37 deletions(-) diff --git a/Gemfile b/Gemfile index e12c3319a..8a5654a8c 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source "https://rubygems.org" -gem "rails", "4.2.5.2" +gem "rails", "4.2.6" # Legacy Rails features, remove me! # responders (class level) diff --git a/Gemfile.lock b/Gemfile.lock index b1f8b8311..cdd70b4fd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -3,40 +3,40 @@ GEM remote: https://rails-assets.org/ specs: CFPropertyList (2.3.2) - actionmailer (4.2.5.2) - actionpack (= 4.2.5.2) - actionview (= 4.2.5.2) - activejob (= 4.2.5.2) + actionmailer (4.2.6) + actionpack (= 4.2.6) + actionview (= 4.2.6) + activejob (= 4.2.6) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.5.2) - actionview (= 4.2.5.2) - activesupport (= 4.2.5.2) + actionpack (4.2.6) + actionview (= 4.2.6) + activesupport (= 4.2.6) rack (~> 1.6) rack-test (~> 0.6.2) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (4.2.5.2) - activesupport (= 4.2.5.2) + actionview (4.2.6) + activesupport (= 4.2.6) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) active_model_serializers (0.9.4) activemodel (>= 3.2) - activejob (4.2.5.2) - activesupport (= 4.2.5.2) + activejob (4.2.6) + activesupport (= 4.2.6) globalid (>= 0.3.0) - activemodel (4.2.5.2) - activesupport (= 4.2.5.2) + activemodel (4.2.6) + activesupport (= 4.2.6) builder (~> 3.1) - activerecord (4.2.5.2) - activemodel (= 4.2.5.2) - activesupport (= 4.2.5.2) + activerecord (4.2.6) + activemodel (= 4.2.6) + activesupport (= 4.2.6) arel (~> 6.0) activerecord-import (0.11.0) activerecord (>= 3.0) - activesupport (4.2.5.2) + activesupport (4.2.6) i18n (~> 0.7) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) @@ -439,21 +439,23 @@ GEM lumberjack (1.0.10) macaddr (1.7.1) systemu (~> 2.6.2) - mail (2.6.3) - mime-types (>= 1.16, < 3) + mail (2.6.4) + mime-types (>= 1.16, < 4) markerb (1.1.0) memoizable (0.4.2) thread_safe (~> 0.3, >= 0.3.1) messagebus_ruby_api (1.0.3) method_source (0.8.2) - mime-types (2.99.1) + mime-types (3.0) + mime-types-data (~> 3.2015) + mime-types-data (3.2016.0221) mini_magick (4.4.0) mini_portile2 (2.0.0) minitest (5.8.4) mobile-fu (1.3.1) rack-mobile-detect rails - multi_json (1.11.2) + multi_json (1.12.0) multi_test (0.1.2) multi_xml (0.5.5) multipart-post (2.0.0) @@ -530,16 +532,16 @@ GEM rack rack-test (0.6.3) rack (>= 1.0) - rails (4.2.5.2) - actionmailer (= 4.2.5.2) - actionpack (= 4.2.5.2) - actionview (= 4.2.5.2) - activejob (= 4.2.5.2) - activemodel (= 4.2.5.2) - activerecord (= 4.2.5.2) - activesupport (= 4.2.5.2) + rails (4.2.6) + actionmailer (= 4.2.6) + actionpack (= 4.2.6) + actionview (= 4.2.6) + activejob (= 4.2.6) + activemodel (= 4.2.6) + activerecord (= 4.2.6) + activesupport (= 4.2.6) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.5.2) + railties (= 4.2.6) sprockets-rails rails-assets-diaspora_jsxc (0.1.4) rails-assets-favico.js (~> 0.3.9) @@ -604,14 +606,14 @@ GEM remotipart (~> 1.0) safe_yaml (~> 1.0) sass-rails (>= 4.0, < 6) - railties (4.2.5.2) - actionpack (= 4.2.5.2) - activesupport (= 4.2.5.2) + railties (4.2.6) + actionpack (= 4.2.6) + activesupport (= 4.2.6) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rainbow (2.1.0) raindrops (0.15.0) - rake (10.5.0) + rake (11.1.2) rb-fsevent (0.9.7) rb-inotify (0.9.7) ffi (>= 0.5.0) @@ -852,7 +854,7 @@ DEPENDENCIES rack-protection (= 1.5.3) rack-rewrite (= 1.5.1) rack-ssl (= 1.4.1) - rails (= 4.2.5.2) + rails (= 4.2.6) rails-assets-diaspora_jsxc (~> 0.1.4)! rails-assets-highlightjs (= 9.1.0)! rails-assets-jakobmattsson--jquery-elastic (= 1.6.11)! @@ -908,4 +910,4 @@ DEPENDENCIES will_paginate (= 3.1.0) BUNDLED WITH - 1.11.2 + 1.12.1 From f725349f1826e0318cfbb7b81c6c901b4c5c0204 Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Thu, 12 May 2016 01:43:18 +0200 Subject: [PATCH 02/51] Bump active_model_serializers --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 8a5654a8c..faefeec6b 100644 --- a/Gemfile +++ b/Gemfile @@ -144,7 +144,7 @@ gem "omniauth-wordpress", "0.2.2" # Serializers -gem "active_model_serializers", "0.9.4" +gem "active_model_serializers", "0.9.5" # XMPP chat dependencies gem "diaspora-vines", "~> 0.2.0.develop" diff --git a/Gemfile.lock b/Gemfile.lock index cdd70b4fd..c161d9cf4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -22,7 +22,7 @@ GEM erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) - active_model_serializers (0.9.4) + active_model_serializers (0.9.5) activemodel (>= 3.2) activejob (4.2.6) activesupport (= 4.2.6) @@ -780,7 +780,7 @@ PLATFORMS ruby DEPENDENCIES - active_model_serializers (= 0.9.4) + active_model_serializers (= 0.9.5) activerecord-import (= 0.11.0) acts-as-taggable-on (= 3.5.0) acts_as_api (= 0.4.2) From 02ea344636883c10ee4cec627df60a30448eca06 Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Thu, 12 May 2016 01:45:53 +0200 Subject: [PATCH 03/51] Bump activerecord-import --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index faefeec6b..f0eaad200 100644 --- a/Gemfile +++ b/Gemfile @@ -65,7 +65,7 @@ ENV["DB"] ||= "mysql" gem "mysql2", "0.4.3" if ENV["DB"] == "all" || ENV["DB"] == "mysql" gem "pg", "0.18.4" if ENV["DB"] == "all" || ENV["DB"] == "postgres" -gem "activerecord-import", "0.11.0" +gem "activerecord-import", "0.13.0" # File uploading diff --git a/Gemfile.lock b/Gemfile.lock index c161d9cf4..34700980d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -34,7 +34,7 @@ GEM activemodel (= 4.2.6) activesupport (= 4.2.6) arel (~> 6.0) - activerecord-import (0.11.0) + activerecord-import (0.13.0) activerecord (>= 3.0) activesupport (4.2.6) i18n (~> 0.7) @@ -781,7 +781,7 @@ PLATFORMS DEPENDENCIES active_model_serializers (= 0.9.5) - activerecord-import (= 0.11.0) + activerecord-import (= 0.13.0) acts-as-taggable-on (= 3.5.0) acts_as_api (= 0.4.2) addressable (= 2.3.8) From b72fd03a31b9d19d369f3c8fe1097ea3c715c412 Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Thu, 12 May 2016 01:50:20 +0200 Subject: [PATCH 04/51] Bump autoprefixer-rails --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index f0eaad200..e0731ac06 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.5" gem "sass-rails", "5.0.4" -gem "autoprefixer-rails", "6.3.3.1" +gem "autoprefixer-rails", "6.3.6" # Database diff --git a/Gemfile.lock b/Gemfile.lock index 34700980d..39eddedad 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -57,7 +57,7 @@ GEM ast (2.2.0) astrolabe (1.3.1) parser (~> 2.2) - autoprefixer-rails (6.3.3.1) + autoprefixer-rails (6.3.6) execjs backbone-on-rails (1.2.0.0) eco @@ -786,7 +786,7 @@ DEPENDENCIES acts_as_api (= 0.4.2) addressable (= 2.3.8) asset_sync (= 1.1.0) - autoprefixer-rails (= 6.3.3.1) + autoprefixer-rails (= 6.3.6) backbone-on-rails (= 1.2.0.0) bootstrap-sass (= 2.3.2.2) capybara (= 2.6.2) From 4c06540f224d6faa61466e030d62fa79ceec0ee6 Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Thu, 12 May 2016 01:52:14 +0200 Subject: [PATCH 05/51] Bump carrierwave --- Gemfile | 2 +- Gemfile.lock | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index e0731ac06..ed66a2ea0 100644 --- a/Gemfile +++ b/Gemfile @@ -69,7 +69,7 @@ gem "activerecord-import", "0.13.0" # File uploading -gem "carrierwave", "0.10.0" +gem "carrierwave", "0.11.2" gem "fog", "1.37.0" gem "mini_magick", "4.4.0" gem "remotipart", "1.2.1" diff --git a/Gemfile.lock b/Gemfile.lock index 39eddedad..8d604908b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -77,11 +77,12 @@ GEM rack (>= 1.0.0) rack-test (>= 0.5.4) xpath (~> 2.0) - carrierwave (0.10.0) + carrierwave (0.11.2) activemodel (>= 3.2.0) activesupport (>= 3.2.0) json (>= 1.7) mime-types (>= 1.16) + mimemagic (>= 0.3.0) celluloid (0.16.0) timers (~> 4.0.0) celluloid-io (0.16.2) @@ -449,6 +450,7 @@ GEM mime-types (3.0) mime-types-data (~> 3.2015) mime-types-data (3.2016.0221) + mimemagic (0.3.1) mini_magick (4.4.0) mini_portile2 (2.0.0) minitest (5.8.4) @@ -790,7 +792,7 @@ DEPENDENCIES backbone-on-rails (= 1.2.0.0) bootstrap-sass (= 2.3.2.2) capybara (= 2.6.2) - carrierwave (= 0.10.0) + carrierwave (= 0.11.2) compass-rails (= 2.0.5) configurate (= 0.3.1) cucumber-rails (= 1.4.3) From 2b45ba67c6bfe161b23c3880547ed3bd3b1eca4c Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Thu, 12 May 2016 01:53:22 +0200 Subject: [PATCH 06/51] Bump database_cleaner --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index ed66a2ea0..65d453c8b 100644 --- a/Gemfile +++ b/Gemfile @@ -262,7 +262,7 @@ group :test do # Cucumber (integration tests) gem "capybara", "2.6.2" - gem "database_cleaner" , "1.5.1" + gem "database_cleaner" , "1.5.3" gem "selenium-webdriver", "2.47.1" # General helpers diff --git a/Gemfile.lock b/Gemfile.lock index 8d604908b..7d687df62 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -136,7 +136,7 @@ GEM nokogiri (~> 1.5) railties (>= 3, < 5) cucumber-wire (0.0.1) - database_cleaner (1.5.1) + database_cleaner (1.5.3) devise (3.5.6) bcrypt (~> 3.0) orm_adapter (~> 0.1) @@ -796,7 +796,7 @@ DEPENDENCIES compass-rails (= 2.0.5) configurate (= 0.3.1) cucumber-rails (= 1.4.3) - database_cleaner (= 1.5.1) + database_cleaner (= 1.5.3) devise (= 3.5.6) devise-token_authenticatable (~> 0.4.0) devise_lastseenable (= 0.0.6) From 7e9da88601c043d6483207361a3f6a8ace713e71 Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Thu, 12 May 2016 01:54:26 +0200 Subject: [PATCH 07/51] Bump devise-token_authenticatable --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 7d687df62..45a5d50f6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -64,7 +64,7 @@ GEM ejs jquery-rails railties - bcrypt (3.1.10) + bcrypt (3.1.11) bootstrap-sass (2.3.2.2) sass (~> 3.2) buftok (0.2.0) @@ -144,8 +144,8 @@ GEM responders thread_safe (~> 0.1) warden (~> 1.2.3) - devise-token_authenticatable (0.4.0) - devise (~> 3.5.0) + devise-token_authenticatable (0.4.6) + devise (>= 3.5.2, < 4.0.0) devise_lastseenable (0.0.6) devise rails (>= 3.0.4) From 7c256018a7539b35ddb1b1366ecf6e262af18db7 Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Thu, 12 May 2016 01:55:25 +0200 Subject: [PATCH 08/51] Bump factory_girl_rails --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 65d453c8b..2ca7497dc 100644 --- a/Gemfile +++ b/Gemfile @@ -267,7 +267,7 @@ group :test do # General helpers - gem "factory_girl_rails", "4.6.0" + gem "factory_girl_rails", "4.7.0" gem "timecop", "0.8.0" gem "webmock", "1.22.6", require: false gem "shoulda-matchers", "3.1.1" diff --git a/Gemfile.lock b/Gemfile.lock index 45a5d50f6..4db67bb0d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -199,10 +199,10 @@ GEM facebox-rails (0.2.0) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) - factory_girl (4.5.0) + factory_girl (4.7.0) activesupport (>= 3.0.0) - factory_girl_rails (4.6.0) - factory_girl (~> 4.5.0) + factory_girl_rails (4.7.0) + factory_girl (~> 4.7.0) railties (>= 3.0.0) faraday (0.9.2) multipart-post (>= 1.2, < 3) @@ -806,7 +806,7 @@ DEPENDENCIES entypo-rails (= 2.2.3) eye (= 0.7) facebox-rails (= 0.2.0) - factory_girl_rails (= 4.6.0) + factory_girl_rails (= 4.7.0) faraday (= 0.9.2) faraday-cookie_jar (= 0.0.6) faraday_middleware (= 0.10.0) From 6411449567f2e5cac71e63a57b45be432deadd54 Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Thu, 12 May 2016 01:56:40 +0200 Subject: [PATCH 09/51] Bump fog and adapters --- Gemfile | 2 +- Gemfile.lock | 40 +++++++++++++++++++++++++++++----------- 2 files changed, 30 insertions(+), 12 deletions(-) diff --git a/Gemfile b/Gemfile index 2ca7497dc..53ca78a2c 100644 --- a/Gemfile +++ b/Gemfile @@ -70,7 +70,7 @@ gem "activerecord-import", "0.13.0" # File uploading gem "carrierwave", "0.11.2" -gem "fog", "1.37.0" +gem "fog", "1.38.0" gem "mini_magick", "4.4.0" gem "remotipart", "1.2.1" diff --git a/Gemfile.lock b/Gemfile.lock index 4db67bb0d..55e4b6e4c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -188,7 +188,7 @@ GEM ethon (0.8.1) ffi (>= 1.3.0) eventmachine (1.0.9.1) - excon (0.45.4) + excon (0.49.0) execjs (2.6.0) eye (0.7) celluloid (~> 0.16.0) @@ -217,19 +217,22 @@ GEM fixture_builder (0.4.1) activerecord (>= 2) activesupport (>= 2) - fog (1.37.0) + fog (1.38.0) fog-aliyun (>= 0.1.0) fog-atmos fog-aws (>= 0.6.0) fog-brightbox (~> 0.4) + fog-cloudatcost (~> 0.1.0) fog-core (~> 1.32) fog-dynect (~> 0.0.2) fog-ecloud (~> 0.1) fog-google (<= 0.1.0) fog-json fog-local + fog-openstack fog-powerdns (>= 0.1.1) fog-profitbricks + fog-rackspace fog-radosgw (>= 0.0.2) fog-riakcs fog-sakuracloud (>= 0.0.4) @@ -251,7 +254,7 @@ GEM fog-atmos (0.1.0) fog-core fog-xml - fog-aws (0.8.1) + fog-aws (0.9.2) fog-core (~> 1.27) fog-json (~> 1.0) fog-xml (~> 0.1) @@ -260,11 +263,16 @@ GEM fog-core (~> 1.22) fog-json inflecto (~> 0.0.2) - fog-core (1.35.0) + fog-cloudatcost (0.1.2) + fog-core (~> 1.36) + fog-json (~> 1.0) + fog-xml (~> 0.1) + ipaddress (~> 0.8) + fog-core (1.39.0) builder - excon (~> 0.45) + excon (~> 0.49) formatador (~> 0.2) - fog-dynect (0.0.2) + fog-dynect (0.0.3) fog-core fog-json fog-xml @@ -278,8 +286,13 @@ GEM fog-json (1.0.2) fog-core (~> 1.0) multi_json (~> 1.10) - fog-local (0.2.1) + fog-local (0.3.0) fog-core (~> 1.27) + fog-openstack (0.1.5) + fog-core (>= 1.38) + fog-json (>= 1.0) + fog-xml (>= 0.1) + ipaddress (>= 0.8) fog-powerdns (0.1.1) fog-core (~> 1.27) fog-json (~> 1.0) @@ -288,6 +301,11 @@ GEM fog-core fog-xml nokogiri + fog-rackspace (0.1.1) + fog-core (>= 1.35) + fog-json (>= 1.0) + fog-xml (>= 0.1) + ipaddress (>= 0.8) fog-radosgw (0.0.5) fog-core (>= 1.21.0) fog-json @@ -302,7 +320,7 @@ GEM fog-serverlove (0.1.2) fog-core fog-json - fog-softlayer (1.0.3) + fog-softlayer (1.1.1) fog-core fog-json fog-storm_on_demand (0.1.1) @@ -317,7 +335,7 @@ GEM fog-voxel (0.1.0) fog-core fog-xml - fog-vsphere (0.6.0) + fog-vsphere (0.6.4) fog-core rbvmomi (~> 1.8) fog-xenserver (0.2.3) @@ -395,7 +413,7 @@ GEM railties (>= 3.0.0) ice_cube (0.11.1) inflecto (0.0.2) - ipaddress (0.8.2) + ipaddress (0.8.3) jasmine (2.4.0) jasmine-core (~> 2.4) phantomjs @@ -811,7 +829,7 @@ DEPENDENCIES faraday-cookie_jar (= 0.0.6) faraday_middleware (= 0.10.0) fixture_builder (= 0.4.1) - fog (= 1.37.0) + fog (= 1.38.0) fuubar (= 2.0.0) gon (= 6.0.1) guard (= 2.13.0) From dbe598e194fc4a80be5d4465291c25492ceb2abe Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Thu, 12 May 2016 02:00:41 +0200 Subject: [PATCH 10/51] Bump jquery-rails --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 53ca78a2c..0efb06d5a 100644 --- a/Gemfile +++ b/Gemfile @@ -85,7 +85,7 @@ gem "entypo-rails", "2.2.3" gem "backbone-on-rails", "1.2.0.0" gem "handlebars_assets", "0.23.0" -gem "jquery-rails", "4.1.0" +gem "jquery-rails", "4.1.1" gem "jquery-ui-rails", "5.0.5" gem "js_image_paths", "0.1.0" gem "js-routes", "1.2.4" diff --git a/Gemfile.lock b/Gemfile.lock index 55e4b6e4c..b6695f2e8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -421,8 +421,8 @@ GEM rake jasmine-core (2.4.1) jasmine-jquery-rails (2.0.3) - jquery-rails (4.1.0) - rails-dom-testing (~> 1.0) + jquery-rails (4.1.1) + rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) jquery-ui-rails (5.0.5) @@ -843,7 +843,7 @@ DEPENDENCIES i18n-inflector-rails (= 1.0.7) jasmine (= 2.4.0) jasmine-jquery-rails (= 2.0.3) - jquery-rails (= 4.1.0) + jquery-rails (= 4.1.1) jquery-ui-rails (= 5.0.5) js-routes (= 1.2.4) js_image_paths (= 0.1.0) From 93afbb924c4dfb294254ed8ee3cc12462701084e Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Thu, 12 May 2016 02:02:58 +0200 Subject: [PATCH 11/51] Bump js-routes --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 0efb06d5a..e774264cf 100644 --- a/Gemfile +++ b/Gemfile @@ -88,7 +88,7 @@ gem "handlebars_assets", "0.23.0" gem "jquery-rails", "4.1.1" gem "jquery-ui-rails", "5.0.5" gem "js_image_paths", "0.1.0" -gem "js-routes", "1.2.4" +gem "js-routes", "1.2.5" source "https://rails-assets.org" do gem "rails-assets-jquery", "1.12.0" # Should be kept in sync with jquery-rails diff --git a/Gemfile.lock b/Gemfile.lock index b6695f2e8..75419b00a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -427,7 +427,7 @@ GEM thor (>= 0.14, < 2.0) jquery-ui-rails (5.0.5) railties (>= 3.2.16) - js-routes (1.2.4) + js-routes (1.2.5) railties (>= 3.2) sprockets-rails js_image_paths (0.1.0) @@ -845,7 +845,7 @@ DEPENDENCIES jasmine-jquery-rails (= 2.0.3) jquery-rails (= 4.1.1) jquery-ui-rails (= 5.0.5) - js-routes (= 1.2.4) + js-routes (= 1.2.5) js_image_paths (= 0.1.0) jshintrb (= 0.3.0) json (= 1.8.3) From bb881565921e0ba72eb68bd0b253cf3bd6a2f328 Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Thu, 12 May 2016 02:03:51 +0200 Subject: [PATCH 12/51] Bump json-schema --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index e774264cf..eba444908 100644 --- a/Gemfile +++ b/Gemfile @@ -18,7 +18,7 @@ gem "diaspora_federation-rails", "0.0.13" gem "acts_as_api", "0.4.2" gem "json", "1.8.3" -gem "json-schema", "2.6.0" +gem "json-schema", "2.6.1" # Authentication diff --git a/Gemfile.lock b/Gemfile.lock index 75419b00a..75aad7a08 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -437,7 +437,7 @@ GEM multi_json (>= 1.3) rake json (1.8.3) - json-schema (2.6.0) + json-schema (2.6.1) addressable (~> 2.3.8) jwt (1.5.1) kaminari (0.16.3) @@ -849,7 +849,7 @@ DEPENDENCIES js_image_paths (= 0.1.0) jshintrb (= 0.3.0) json (= 1.8.3) - json-schema (= 2.6.0) + json-schema (= 2.6.1) logging-rails (= 0.5.0) markerb (= 1.1.0) messagebus_ruby_api (= 1.0.3) From b8e3c6cfb1142e403081f951d6fc37f4cf6d962d Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Thu, 12 May 2016 02:06:08 +0200 Subject: [PATCH 13/51] Bump mini_magick --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index eba444908..a6aef6e97 100644 --- a/Gemfile +++ b/Gemfile @@ -71,7 +71,7 @@ gem "activerecord-import", "0.13.0" gem "carrierwave", "0.11.2" gem "fog", "1.38.0" -gem "mini_magick", "4.4.0" +gem "mini_magick", "4.5.1" gem "remotipart", "1.2.1" # GUID generation diff --git a/Gemfile.lock b/Gemfile.lock index 75aad7a08..bc5d345ec 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -469,7 +469,7 @@ GEM mime-types-data (~> 3.2015) mime-types-data (3.2016.0221) mimemagic (0.3.1) - mini_magick (4.4.0) + mini_magick (4.5.1) mini_portile2 (2.0.0) minitest (5.8.4) mobile-fu (1.3.1) @@ -853,7 +853,7 @@ DEPENDENCIES logging-rails (= 0.5.0) markerb (= 1.1.0) messagebus_ruby_api (= 1.0.3) - mini_magick (= 4.4.0) + mini_magick (= 4.5.1) minitest mobile-fu (= 1.3.1) mysql2 (= 0.4.3) From 8d214e8952984236a172a3bfbe105ab705be7ae6 Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Thu, 12 May 2016 02:07:01 +0200 Subject: [PATCH 14/51] Bump mysql2 --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index a6aef6e97..fa606e46c 100644 --- a/Gemfile +++ b/Gemfile @@ -62,7 +62,7 @@ gem "autoprefixer-rails", "6.3.6" ENV["DB"] ||= "mysql" -gem "mysql2", "0.4.3" if ENV["DB"] == "all" || ENV["DB"] == "mysql" +gem "mysql2", "0.4.4" if ENV["DB"] == "all" || ENV["DB"] == "mysql" gem "pg", "0.18.4" if ENV["DB"] == "all" || ENV["DB"] == "postgres" gem "activerecord-import", "0.13.0" diff --git a/Gemfile.lock b/Gemfile.lock index bc5d345ec..000243739 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -479,7 +479,7 @@ GEM multi_test (0.1.2) multi_xml (0.5.5) multipart-post (2.0.0) - mysql2 (0.4.3) + mysql2 (0.4.4) naught (1.1.0) nenv (0.3.0) nested_form (0.3.2) @@ -856,7 +856,7 @@ DEPENDENCIES mini_magick (= 4.5.1) minitest mobile-fu (= 1.3.1) - mysql2 (= 0.4.3) + mysql2 (= 0.4.4) nokogiri (= 1.6.7.2) omniauth (= 1.3.1) omniauth-facebook (= 3.0.0) From a73a9fefa68f30323cf77b46b3b830e3045eece5 Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Thu, 12 May 2016 02:10:48 +0200 Subject: [PATCH 15/51] Bump rails-assets-highlightjs --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index fa606e46c..05d664751 100644 --- a/Gemfile +++ b/Gemfile @@ -100,7 +100,7 @@ source "https://rails-assets.org" do gem "rails-assets-markdown-it--markdown-it-for-inline", "0.1.1" gem "rails-assets-markdown-it-sub", "1.0.0" gem "rails-assets-markdown-it-sup", "1.0.0" - gem "rails-assets-highlightjs", "9.1.0" + gem "rails-assets-highlightjs", "9.2.0" # jQuery plugins diff --git a/Gemfile.lock b/Gemfile.lock index 000243739..6c6a86ce7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -571,7 +571,7 @@ GEM rails-assets-jquery.slimscroll (~> 1.3.6) rails-assets-jquery.ui (~> 1.11.4) rails-assets-favico.js (0.3.10) - rails-assets-highlightjs (9.1.0) + rails-assets-highlightjs (9.2.0) rails-assets-jakobmattsson--jquery-elastic (1.6.11) rails-assets-jquery (>= 1.2.6) rails-assets-jasmine (2.4.1) @@ -876,7 +876,7 @@ DEPENDENCIES rack-ssl (= 1.4.1) rails (= 4.2.6) rails-assets-diaspora_jsxc (~> 0.1.4)! - rails-assets-highlightjs (= 9.1.0)! + rails-assets-highlightjs (= 9.2.0)! rails-assets-jakobmattsson--jquery-elastic (= 1.6.11)! rails-assets-jasmine-ajax (= 3.2.0)! rails-assets-jeresig--jquery.hotkeys (= 0.2.0)! From bd705bd01f8d694ad133dc0aca6f609bbf258912 Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Thu, 12 May 2016 02:12:37 +0200 Subject: [PATCH 16/51] Bump rails-assets-perfect-scrollbar --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 05d664751..5c199ba56 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.3.1" gem "rails-assets-jquery-textchange", "0.2.3" - gem "rails-assets-perfect-scrollbar", "0.6.10" + gem "rails-assets-perfect-scrollbar", "0.6.11" gem "rails-assets-jakobmattsson--jquery-elastic", "1.6.11" end diff --git a/Gemfile.lock b/Gemfile.lock index 6c6a86ce7..833af9f86 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -597,7 +597,7 @@ GEM rails-assets-markdown-it-sanitizer (0.4.1) rails-assets-markdown-it-sub (1.0.0) rails-assets-markdown-it-sup (1.0.0) - rails-assets-perfect-scrollbar (0.6.10) + rails-assets-perfect-scrollbar (0.6.11) rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) rails-dom-testing (1.0.7) @@ -890,7 +890,7 @@ DEPENDENCIES rails-assets-markdown-it-sanitizer (= 0.4.1)! rails-assets-markdown-it-sub (= 1.0.0)! rails-assets-markdown-it-sup (= 1.0.0)! - rails-assets-perfect-scrollbar (= 0.6.10)! + rails-assets-perfect-scrollbar (= 0.6.11)! rails-i18n (= 4.0.8) rails-timeago (= 2.11.0) rails_admin (= 0.8.1) From 87644862de6938f80254c6f42e4b426fa315c323 Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Thu, 12 May 2016 02:13:53 +0200 Subject: [PATCH 17/51] Bump responders --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 5c199ba56..3e51f4080 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,7 @@ gem "rails", "4.2.6" # Legacy Rails features, remove me! # responders (class level) -gem "responders", "2.1.1" +gem "responders", "2.2.0" # Appserver diff --git a/Gemfile.lock b/Gemfile.lock index 833af9f86..d365bd131 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -647,7 +647,7 @@ GEM redis (~> 3.0, >= 3.0.4) remotipart (1.2.1) request_store (1.3.0) - responders (2.1.1) + responders (2.2.0) railties (>= 4.2.0, < 5.1) roxml (3.1.6) activesupport (>= 2.3.0) @@ -898,7 +898,7 @@ DEPENDENCIES rb-inotify (= 0.9.7) redcarpet (= 3.3.4) remotipart (= 1.2.1) - responders (= 2.1.1) + responders (= 2.2.0) roxml (= 3.1.6) rspec-instafail (= 0.4.0) rspec-rails (= 3.4.2) From 04f2f0741a19f2344544b750aba1b512b601bcb0 Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Thu, 12 May 2016 02:14:57 +0200 Subject: [PATCH 18/51] Bump rspec-instafail --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 3e51f4080..efaa30288 100644 --- a/Gemfile +++ b/Gemfile @@ -256,7 +256,7 @@ group :test do gem "fixture_builder", "0.4.1" gem "fuubar", "2.0.0" - gem "rspec-instafail", "0.4.0", require: false + gem "rspec-instafail", "0.5.0", require: false gem "test_after_commit", "0.4.2" # Cucumber (integration tests) diff --git a/Gemfile.lock b/Gemfile.lock index d365bd131..f3d1794ec 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -656,12 +656,12 @@ GEM rspec-core (~> 3.4.0) rspec-expectations (~> 3.4.0) rspec-mocks (~> 3.4.0) - rspec-core (3.4.2) + rspec-core (3.4.4) rspec-support (~> 3.4.0) rspec-expectations (3.4.0) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.4.0) - rspec-instafail (0.4.0) + rspec-instafail (0.5.0) rspec rspec-mocks (3.4.1) diff-lcs (>= 1.2.0, < 2.0) @@ -900,7 +900,7 @@ DEPENDENCIES remotipart (= 1.2.1) responders (= 2.2.0) roxml (= 3.1.6) - rspec-instafail (= 0.4.0) + rspec-instafail (= 0.5.0) rspec-rails (= 3.4.2) rubocop (= 0.35.1) ruby-oembed (= 0.9.0) From ee98a965940eaec36002e2d8bddf4483f9bbfdf7 Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Thu, 12 May 2016 02:16:16 +0200 Subject: [PATCH 19/51] Bump ruby-oembed --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index efaa30288..d6a090abf 100644 --- a/Gemfile +++ b/Gemfile @@ -130,7 +130,7 @@ gem "nokogiri", "1.6.7.2" gem "redcarpet", "3.3.4" gem "twitter-text", "1.13.3" gem "roxml", "3.1.6" -gem "ruby-oembed", "0.9.0" +gem "ruby-oembed", "0.10.0" gem "open_graph_reader", "0.6.1" # Services diff --git a/Gemfile.lock b/Gemfile.lock index f3d1794ec..c968d6735 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -682,7 +682,7 @@ GEM rainbow (>= 1.99.1, < 3.0) ruby-progressbar (~> 1.7) tins (<= 1.6.0) - ruby-oembed (0.9.0) + ruby-oembed (0.10.0) ruby-progressbar (1.7.5) rubyzip (1.1.7) safe_yaml (1.0.4) @@ -903,7 +903,7 @@ DEPENDENCIES rspec-instafail (= 0.5.0) rspec-rails (= 3.4.2) rubocop (= 0.35.1) - ruby-oembed (= 0.9.0) + ruby-oembed (= 0.10.0) rubyzip (= 1.1.7) sass-rails (= 5.0.4) selenium-webdriver (= 2.47.1) From 81779a86e59766ed7aaf406d0ecec61a739772d0 Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Thu, 12 May 2016 02:17:07 +0200 Subject: [PATCH 20/51] Bump rubyzip --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index d6a090abf..de920ae43 100644 --- a/Gemfile +++ b/Gemfile @@ -176,7 +176,7 @@ gem "logging-rails", "0.5.0", require: "logging/rails" # Reading and writing zip files -gem "rubyzip", "1.1.7", require: "zip" +gem "rubyzip", "1.2.0", require: "zip" # Prevent occasions where minitest is not bundled in # packaged versions of ruby. See following issues/prs: diff --git a/Gemfile.lock b/Gemfile.lock index c968d6735..bec70f574 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -684,7 +684,7 @@ GEM tins (<= 1.6.0) ruby-oembed (0.10.0) ruby-progressbar (1.7.5) - rubyzip (1.1.7) + rubyzip (1.2.0) safe_yaml (1.0.4) sass (3.4.21) sass-rails (5.0.4) @@ -904,7 +904,7 @@ DEPENDENCIES rspec-rails (= 3.4.2) rubocop (= 0.35.1) ruby-oembed (= 0.10.0) - rubyzip (= 1.1.7) + rubyzip (= 1.2.0) sass-rails (= 5.0.4) selenium-webdriver (= 2.47.1) shoulda-matchers (= 3.1.1) From 43d0946769a71101781fe11e6cb31f0fd95dbe74 Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Thu, 12 May 2016 02:19:40 +0200 Subject: [PATCH 21/51] Bump spring --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index de920ae43..d95aa5cd9 100644 --- a/Gemfile +++ b/Gemfile @@ -236,7 +236,7 @@ group :development do # Preloading environment - gem "spring", "1.6.3" + gem "spring", "1.7.1" gem "spring-commands-rspec", "1.0.4" gem "spring-commands-cucumber", "1.0.1" diff --git a/Gemfile.lock b/Gemfile.lock index bec70f574..cb92826c9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -727,7 +727,7 @@ GEM sinon-rails (1.15.0) railties (>= 3.1) slop (3.6.0) - spring (1.6.3) + spring (1.7.1) spring-commands-cucumber (1.0.1) spring (>= 0.9.1) spring-commands-rspec (1.0.4) @@ -914,7 +914,7 @@ DEPENDENCIES simplecov (= 0.11.2) sinatra (= 1.4.7) sinon-rails (= 1.15.0) - spring (= 1.6.3) + spring (= 1.7.1) spring-commands-cucumber (= 1.0.1) spring-commands-rspec (= 1.0.4) test_after_commit (= 0.4.2) From 241f0d977a55f1dce1f43b2451c30c49b8f96d27 Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Thu, 12 May 2016 02:20:44 +0200 Subject: [PATCH 22/51] Bump test_after_commit --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index d95aa5cd9..2ce689110 100644 --- a/Gemfile +++ b/Gemfile @@ -257,7 +257,7 @@ group :test do gem "fixture_builder", "0.4.1" gem "fuubar", "2.0.0" gem "rspec-instafail", "0.5.0", require: false - gem "test_after_commit", "0.4.2" + gem "test_after_commit", "1.0.0" # Cucumber (integration tests) diff --git a/Gemfile.lock b/Gemfile.lock index cb92826c9..9a3245bff 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -743,7 +743,7 @@ GEM sprockets (>= 2.8, < 4.0) state_machine (1.2.0) systemu (2.6.5) - test_after_commit (0.4.2) + test_after_commit (1.0.0) activerecord (>= 3.2) thor (0.19.1) thread_safe (0.3.5) @@ -917,7 +917,7 @@ DEPENDENCIES spring (= 1.7.1) spring-commands-cucumber (= 1.0.1) spring-commands-rspec (= 1.0.4) - test_after_commit (= 0.4.2) + test_after_commit (= 1.0.0) timecop (= 0.8.0) turbo_dev_assets (= 0.0.2) twitter (= 5.16.0) From ac5caadd3dfd813735b0d7d5e61a4eacb328a008 Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Thu, 12 May 2016 02:22:03 +0200 Subject: [PATCH 23/51] Bump timecop --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 2ce689110..0c5aa5e3a 100644 --- a/Gemfile +++ b/Gemfile @@ -268,7 +268,7 @@ group :test do # General helpers gem "factory_girl_rails", "4.7.0" - gem "timecop", "0.8.0" + gem "timecop", "0.8.1" gem "webmock", "1.22.6", require: false gem "shoulda-matchers", "3.1.1" diff --git a/Gemfile.lock b/Gemfile.lock index 9a3245bff..3354755fa 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -748,7 +748,7 @@ GEM thor (0.19.1) thread_safe (0.3.5) tilt (1.4.1) - timecop (0.8.0) + timecop (0.8.1) timers (4.0.4) hitimes tins (1.6.0) @@ -918,7 +918,7 @@ DEPENDENCIES spring-commands-cucumber (= 1.0.1) spring-commands-rspec (= 1.0.4) test_after_commit (= 1.0.0) - timecop (= 0.8.0) + timecop (= 0.8.1) turbo_dev_assets (= 0.0.2) twitter (= 5.16.0) twitter-text (= 1.13.3) From d16f9ef4b42afa5caa7c492c2fba24f05efc77cd Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Thu, 12 May 2016 02:23:28 +0200 Subject: [PATCH 24/51] Bump twitter-text --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 0c5aa5e3a..ccbefe298 100644 --- a/Gemfile +++ b/Gemfile @@ -128,7 +128,7 @@ gem "messagebus_ruby_api", "1.0.3" gem "nokogiri", "1.6.7.2" gem "redcarpet", "3.3.4" -gem "twitter-text", "1.13.3" +gem "twitter-text", "1.13.4" gem "roxml", "3.1.6" gem "ruby-oembed", "0.10.0" gem "open_graph_reader", "0.6.1" diff --git a/Gemfile.lock b/Gemfile.lock index 3354755fa..cc80d9838 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -765,7 +765,7 @@ GEM memoizable (~> 0.4.0) naught (~> 1.0) simple_oauth (~> 0.3.0) - twitter-text (1.13.3) + twitter-text (1.13.4) unf (~> 0.1.0) typhoeus (1.0.1) ethon (>= 0.8.0) @@ -921,7 +921,7 @@ DEPENDENCIES timecop (= 0.8.1) turbo_dev_assets (= 0.0.2) twitter (= 5.16.0) - twitter-text (= 1.13.3) + twitter-text (= 1.13.4) typhoeus (= 1.0.1) uglifier (= 2.7.2) unicorn (= 5.0.1) From ca548ed0344f3ff5c532926400f8f1450bfa5e64 Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Thu, 12 May 2016 02:24:21 +0200 Subject: [PATCH 25/51] Bump typhoeus --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index ccbefe298..592c07717 100644 --- a/Gemfile +++ b/Gemfile @@ -160,7 +160,7 @@ gem "addressable", "2.3.8", require: "addressable/uri" gem "faraday", "0.9.2" gem "faraday_middleware", "0.10.0" gem "faraday-cookie_jar", "0.0.6" -gem "typhoeus", "1.0.1" +gem "typhoeus", "1.0.2" # Views diff --git a/Gemfile.lock b/Gemfile.lock index cc80d9838..33fc412ab 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -185,7 +185,7 @@ GEM railties (>= 3.1, <= 5) equalizer (0.0.10) erubis (2.7.0) - ethon (0.8.1) + ethon (0.9.0) ffi (>= 1.3.0) eventmachine (1.0.9.1) excon (0.49.0) @@ -767,8 +767,8 @@ GEM simple_oauth (~> 0.3.0) twitter-text (1.13.4) unf (~> 0.1.0) - typhoeus (1.0.1) - ethon (>= 0.8.0) + typhoeus (1.0.2) + ethon (>= 0.9.0) tzinfo (1.2.2) thread_safe (~> 0.1) uglifier (2.7.2) @@ -922,7 +922,7 @@ DEPENDENCIES turbo_dev_assets (= 0.0.2) twitter (= 5.16.0) twitter-text (= 1.13.4) - typhoeus (= 1.0.1) + typhoeus (= 1.0.2) uglifier (= 2.7.2) unicorn (= 5.0.1) uuid (= 2.3.8) From a5533387be8946acbf70dbc67a934b0b0f0e2c56 Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Thu, 12 May 2016 02:25:41 +0200 Subject: [PATCH 26/51] Bump uglifier --- Gemfile | 2 +- Gemfile.lock | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 592c07717..65b1520fa 100644 --- a/Gemfile +++ b/Gemfile @@ -41,7 +41,7 @@ gem "sidetiq", "0.6.3" # Compression -gem "uglifier", "2.7.2" +gem "uglifier", "3.0.0" # Configuration diff --git a/Gemfile.lock b/Gemfile.lock index 33fc412ab..39af9319c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -771,9 +771,8 @@ GEM ethon (>= 0.9.0) tzinfo (1.2.2) thread_safe (~> 0.1) - uglifier (2.7.2) - execjs (>= 0.3.0) - json (>= 1.8.0) + uglifier (3.0.0) + execjs (>= 0.3.0, < 3) unf (0.1.4) unf_ext unf_ext (0.0.7.2) @@ -923,7 +922,7 @@ DEPENDENCIES twitter (= 5.16.0) twitter-text (= 1.13.4) typhoeus (= 1.0.2) - uglifier (= 2.7.2) + uglifier (= 3.0.0) unicorn (= 5.0.1) uuid (= 2.3.8) webmock (= 1.22.6) From d772848338b92d2522751f4177bc794d503dd9e1 Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Thu, 12 May 2016 02:26:36 +0200 Subject: [PATCH 27/51] Bump unicorn --- Gemfile | 2 +- Gemfile.lock | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 65b1520fa..0a7b88eed 100644 --- a/Gemfile +++ b/Gemfile @@ -8,7 +8,7 @@ gem "responders", "2.2.0" # Appserver -gem "unicorn", "5.0.1", require: false +gem "unicorn", "5.1.0", require: false # Federation diff --git a/Gemfile.lock b/Gemfile.lock index 39af9319c..ee78c1cb7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -632,7 +632,7 @@ GEM rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rainbow (2.1.0) - raindrops (0.15.0) + raindrops (0.16.0) rake (11.1.2) rb-fsevent (0.9.7) rb-inotify (0.9.7) @@ -776,9 +776,8 @@ GEM unf (0.1.4) unf_ext unf_ext (0.0.7.2) - unicorn (5.0.1) + unicorn (5.1.0) kgio (~> 2.6) - rack raindrops (~> 0.7) uuid (2.3.8) macaddr (~> 1.0) @@ -923,7 +922,7 @@ DEPENDENCIES twitter-text (= 1.13.4) typhoeus (= 1.0.2) uglifier (= 3.0.0) - unicorn (= 5.0.1) + unicorn (= 5.1.0) uuid (= 2.3.8) webmock (= 1.22.6) will_paginate (= 3.1.0) From 91ce3bea240226e706a34e7df8ef823b0e413fc9 Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Thu, 12 May 2016 02:30:51 +0200 Subject: [PATCH 28/51] Bump byebug --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index ee78c1cb7..8d30e68d0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -69,7 +69,7 @@ GEM sass (~> 3.2) buftok (0.2.0) builder (3.2.2) - byebug (8.2.2) + byebug (8.2.5) capybara (2.6.2) addressable mime-types (>= 1.16) From d505b669f1a92a93136d07e495db48bc62a33484 Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Thu, 12 May 2016 02:33:48 +0200 Subject: [PATCH 29/51] Bump coderay --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 8d30e68d0..02f0cba44 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -91,7 +91,7 @@ GEM childprocess (0.5.9) ffi (~> 1.0, >= 1.0.11) chunky_png (1.3.5) - coderay (1.1.0) + coderay (1.1.1) coffee-rails (4.1.1) coffee-script (>= 2.2.0) railties (>= 4.0.0, < 5.1.x) From 6d592849686a082b18b74355bccbff31abd686f8 Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Thu, 12 May 2016 02:34:53 +0200 Subject: [PATCH 30/51] Bump cucumber --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 02f0cba44..5b8ad1107 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -119,7 +119,7 @@ GEM connection_pool (2.2.0) crack (0.4.3) safe_yaml (~> 1.0.0) - cucumber (2.3.2) + cucumber (2.3.3) builder (>= 2.1.2) cucumber-core (~> 1.4.0) cucumber-wire (~> 0.0.1) From 0483dde36a71df162d7a79ea3098903988cd24cd Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Thu, 12 May 2016 02:35:38 +0200 Subject: [PATCH 31/51] Bump domain_name --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 5b8ad1107..3cbc5339a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -170,7 +170,7 @@ GEM factory_girl (~> 4.5, >= 4.5.0) diff-lcs (1.2.5) docile (1.1.5) - domain_name (0.5.20160128) + domain_name (0.5.20160310) unf (>= 0.0.5, < 1.0.0) eco (1.0.0) coffee-script From 529ebe95e1f715da4240f6d4eb9d38cf0951d04e Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Thu, 12 May 2016 02:38:21 +0200 Subject: [PATCH 32/51] Bump font-awesome-rails --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 3cbc5339a..f2a6e5360 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -344,8 +344,8 @@ GEM fog-xml (0.1.2) fog-core nokogiri (~> 1.5, >= 1.5.11) - font-awesome-rails (4.5.0.0) - railties (>= 3.2, < 5.0) + font-awesome-rails (4.6.2.0) + railties (>= 3.2, < 5.1) formatador (0.2.5) fuubar (2.0.0) rspec (~> 3.0) From d46f3864504eee00185770fce544f1f1d72c02d0 Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Thu, 12 May 2016 02:40:29 +0200 Subject: [PATCH 33/51] Bump hashdiff --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index f2a6e5360..9a0072b05 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -389,7 +389,7 @@ GEM multi_json (~> 1.0) sprockets (>= 2.0.0) tilt (>= 1.2) - hashdiff (0.2.3) + hashdiff (0.3.0) hashie (3.4.3) hike (1.2.3) hiredis (0.6.1) From 2f8ae82ca499f1eaa56a0a41787f1b4cf588687c Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Thu, 12 May 2016 02:41:16 +0200 Subject: [PATCH 34/51] Bump hashie --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 9a0072b05..302f5e9f2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -390,7 +390,7 @@ GEM sprockets (>= 2.0.0) tilt (>= 1.2) hashdiff (0.3.0) - hashie (3.4.3) + hashie (3.4.4) hike (1.2.3) hiredis (0.6.1) hitimes (1.2.3) From 036dd843ebb610e266c9401d5b31ec4d4330741a Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Thu, 12 May 2016 02:42:54 +0200 Subject: [PATCH 35/51] Bump hitimes --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 302f5e9f2..bc3526565 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -393,7 +393,7 @@ GEM hashie (3.4.4) hike (1.2.3) hiredis (0.6.1) - hitimes (1.2.3) + hitimes (1.2.4) http (1.0.2) addressable (~> 2.3) http-cookie (~> 1.0) From 2d72ff82defd8016ee67a8ebf69e68540b77ac0f Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Thu, 12 May 2016 02:43:42 +0200 Subject: [PATCH 36/51] Bump http --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index bc3526565..741ac697a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -394,7 +394,7 @@ GEM hike (1.2.3) hiredis (0.6.1) hitimes (1.2.4) - http (1.0.2) + http (1.0.4) addressable (~> 2.3) http-cookie (~> 1.0) http-form_data (~> 1.0.1) From d7e50293b34524cb232808a8e551837a704d500b Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Thu, 12 May 2016 02:46:03 +0200 Subject: [PATCH 37/51] Bump logging --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 741ac697a..ce7b94b78 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -448,7 +448,7 @@ GEM rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) little-plugger (1.1.4) - logging (2.0.0) + logging (2.1.0) little-plugger (~> 1.1) multi_json (~> 1.10) logging-rails (0.5.0) From d674c42998736d2a27db5e23fb3d525930a21c5d Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Thu, 12 May 2016 02:47:55 +0200 Subject: [PATCH 38/51] Bump oauth --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index ce7b94b78..9f7114e2b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -489,7 +489,7 @@ GEM notiffany (0.0.8) nenv (~> 0.1) shellany (~> 0.0) - oauth (0.4.7) + oauth (0.5.1) oauth2 (1.1.0) faraday (>= 0.8, < 0.10) jwt (~> 1.0, < 1.5.2) From 79b8f127f6dd22c27c0e15de6f6772734e221e2e Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Thu, 12 May 2016 02:49:18 +0200 Subject: [PATCH 39/51] Bump parser --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 9f7114e2b..e5175e703 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -519,7 +519,7 @@ GEM faraday (~> 0.9.0) nokogiri (~> 1.6) orm_adapter (0.5.0) - parser (2.3.0.4) + parser (2.3.1.0) ast (~> 2.2) phantomjs (2.1.1.0) powerpack (0.1.1) From af018e1005b0da1cf4fc32b932b92b63b611f264 Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Thu, 12 May 2016 02:50:04 +0200 Subject: [PATCH 40/51] Bump rails-assets-jquery-colorbox --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index e5175e703..b698a523b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -580,7 +580,7 @@ GEM rails-assets-jeresig--jquery.hotkeys (0.2.0) rails-assets-jquery (>= 1.4.2) rails-assets-jquery (1.12.0) - rails-assets-jquery-colorbox (1.6.3) + rails-assets-jquery-colorbox (1.6.4) rails-assets-jquery (>= 1.3.2) rails-assets-jquery-fullscreen-plugin (0.5.0) rails-assets-jquery-placeholder (2.3.1) From f3e5f202cc9277bb7d4f745bd69ac40069d5143d Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Thu, 12 May 2016 02:51:33 +0200 Subject: [PATCH 41/51] Bump request_store --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index b698a523b..17cb8599a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -646,7 +646,7 @@ GEM redis-namespace (1.5.2) redis (~> 3.0, >= 3.0.4) remotipart (1.2.1) - request_store (1.3.0) + request_store (1.3.1) responders (2.2.0) railties (>= 4.2.0, < 5.1) roxml (3.1.6) From 7b6d89b7968b12f48ba57b40f48884b08bebcd40 Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Thu, 12 May 2016 02:52:16 +0200 Subject: [PATCH 42/51] Bump ruby-progressbar --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 17cb8599a..a48668334 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -683,7 +683,7 @@ GEM ruby-progressbar (~> 1.7) tins (<= 1.6.0) ruby-oembed (0.10.0) - ruby-progressbar (1.7.5) + ruby-progressbar (1.8.0) rubyzip (1.2.0) safe_yaml (1.0.4) sass (3.4.21) From 1409e6457c3213c702b254f1c1678d1b8a6469e0 Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Thu, 12 May 2016 02:54:52 +0200 Subject: [PATCH 43/51] Bump sass --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index a48668334..56d34f49a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -686,7 +686,7 @@ GEM ruby-progressbar (1.8.0) rubyzip (1.2.0) safe_yaml (1.0.4) - sass (3.4.21) + sass (3.4.22) sass-rails (5.0.4) railties (>= 4.0.0, < 5.0) sass (~> 3.1) From fabd592a5d341a2d8462f8eb84a90e287d193634 Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Thu, 12 May 2016 02:58:44 +0200 Subject: [PATCH 44/51] Bump websocket --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 56d34f49a..ad6932837 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -788,7 +788,7 @@ GEM addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff - websocket (1.2.2) + websocket (1.2.3) will_paginate (3.1.0) xml-simple (1.1.5) xpath (2.0.0) From 40d840066926ee1cd523f5262d95430d1fa2f30a Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Thu, 12 May 2016 03:07:07 +0200 Subject: [PATCH 45/51] Bump capybara --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 0a7b88eed..3d4baebb0 100644 --- a/Gemfile +++ b/Gemfile @@ -261,7 +261,7 @@ group :test do # Cucumber (integration tests) - gem "capybara", "2.6.2" + gem "capybara", "2.7.1" gem "database_cleaner" , "1.5.3" gem "selenium-webdriver", "2.47.1" diff --git a/Gemfile.lock b/Gemfile.lock index ad6932837..4f22b1885 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -70,7 +70,7 @@ GEM buftok (0.2.0) builder (3.2.2) byebug (8.2.5) - capybara (2.6.2) + capybara (2.7.1) addressable mime-types (>= 1.16) nokogiri (>= 1.3.3) @@ -807,7 +807,7 @@ DEPENDENCIES autoprefixer-rails (= 6.3.6) backbone-on-rails (= 1.2.0.0) bootstrap-sass (= 2.3.2.2) - capybara (= 2.6.2) + capybara (= 2.7.1) carrierwave (= 0.11.2) compass-rails (= 2.0.5) configurate (= 0.3.1) From 0fd81021911bd6501f22a309b58299f38968510b Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Thu, 12 May 2016 03:15:44 +0200 Subject: [PATCH 46/51] Bump guard-cucumber --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 3d4baebb0..139214897 100644 --- a/Gemfile +++ b/Gemfile @@ -222,7 +222,7 @@ end group :development do # Automatic test runs - gem "guard-cucumber", "1.5.4" + gem "guard-cucumber", "2.1.2" gem "guard-jshintrb", "1.1.1" gem "guard-rspec", "4.6.4" gem "guard-rubocop", "1.2.0" diff --git a/Gemfile.lock b/Gemfile.lock index 4f22b1885..a7eb1b838 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -368,8 +368,8 @@ GEM shellany (~> 0.0) thor (>= 0.18.1) guard-compat (1.2.1) - guard-cucumber (1.5.4) - cucumber (>= 1.3.0) + guard-cucumber (2.1.2) + cucumber (~> 2.0) guard-compat (~> 1.0) nenv (~> 0.1) guard-jshintrb (1.1.1) @@ -831,7 +831,7 @@ DEPENDENCIES fuubar (= 2.0.0) gon (= 6.0.1) guard (= 2.13.0) - guard-cucumber (= 1.5.4) + guard-cucumber (= 2.1.2) guard-jshintrb (= 1.1.1) guard-rspec (= 4.6.4) guard-rubocop (= 1.2.0) From 66c630041429a3044a7c6128a925529fc1a29df6 Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Thu, 12 May 2016 03:16:31 +0200 Subject: [PATCH 47/51] Bump guard-rspec --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 139214897..ffb6354cb 100644 --- a/Gemfile +++ b/Gemfile @@ -224,7 +224,7 @@ group :development do # Automatic test runs gem "guard-cucumber", "2.1.2" gem "guard-jshintrb", "1.1.1" - gem "guard-rspec", "4.6.4" + gem "guard-rspec", "4.6.5" gem "guard-rubocop", "1.2.0" gem "guard", "2.13.0", require: false gem "rb-fsevent", "0.9.7", require: false diff --git a/Gemfile.lock b/Gemfile.lock index a7eb1b838..6c5dde33b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -375,7 +375,7 @@ GEM guard-jshintrb (1.1.1) guard (~> 2.0) jshintrb - guard-rspec (4.6.4) + guard-rspec (4.6.5) guard (~> 2.1) guard-compat (~> 1.1) rspec (>= 2.99.0, < 4.0) @@ -833,7 +833,7 @@ DEPENDENCIES guard (= 2.13.0) guard-cucumber (= 2.1.2) guard-jshintrb (= 1.1.1) - guard-rspec (= 4.6.4) + guard-rspec (= 4.6.5) guard-rubocop (= 1.2.0) haml (= 4.0.7) handlebars_assets (= 0.23.0) From 0bb6c017f138154c45c9fca91a986e2b009492c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Thu, 12 May 2016 13:13:32 +0200 Subject: [PATCH 48/51] bump rubocop --- Gemfile | 2 +- Gemfile.lock | 13 +++++-------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/Gemfile b/Gemfile index ffb6354cb..777c25c45 100644 --- a/Gemfile +++ b/Gemfile @@ -232,7 +232,7 @@ group :development do # Linters gem "jshintrb", "0.3.0" - gem "rubocop", "0.35.1" + gem "rubocop", "0.40.0" # Preloading environment diff --git a/Gemfile.lock b/Gemfile.lock index 6c5dde33b..2247426f1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -55,8 +55,6 @@ GEM fog (>= 1.8.0) unf ast (2.2.0) - astrolabe (1.3.1) - parser (~> 2.2) autoprefixer-rails (6.3.6) execjs backbone-on-rails (1.2.0.0) @@ -675,13 +673,12 @@ GEM rspec-mocks (~> 3.4.0) rspec-support (~> 3.4.0) rspec-support (3.4.1) - rubocop (0.35.1) - astrolabe (~> 1.3) - parser (>= 2.2.3.0, < 3.0) + rubocop (0.40.0) + parser (>= 2.3.1.0, < 3.0) powerpack (~> 0.1) rainbow (>= 1.99.1, < 3.0) ruby-progressbar (~> 1.7) - tins (<= 1.6.0) + unicode-display_width (~> 1.0, >= 1.0.1) ruby-oembed (0.10.0) ruby-progressbar (1.8.0) rubyzip (1.2.0) @@ -751,7 +748,6 @@ GEM timecop (0.8.1) timers (4.0.4) hitimes - tins (1.6.0) trollop (2.1.2) turbo_dev_assets (0.0.2) twitter (5.16.0) @@ -776,6 +772,7 @@ GEM unf (0.1.4) unf_ext unf_ext (0.0.7.2) + unicode-display_width (1.0.5) unicorn (5.1.0) kgio (~> 2.6) raindrops (~> 0.7) @@ -900,7 +897,7 @@ DEPENDENCIES roxml (= 3.1.6) rspec-instafail (= 0.5.0) rspec-rails (= 3.4.2) - rubocop (= 0.35.1) + rubocop (= 0.40.0) ruby-oembed (= 0.10.0) rubyzip (= 1.2.0) sass-rails (= 5.0.4) From 7b039da24abbe846cfb27757c5f66e7916229280 Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Thu, 12 May 2016 04:04:17 +0200 Subject: [PATCH 49/51] Update Rubocop config --- .rubocop.yml | 4 +++- Gemfile | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 8cced7682..2ee483e70 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,9 +1,11 @@ AllCops: - RunRailsCops: true Exclude: - "bin/**/*" - "db/schema.rb" +Rails: + Enabled: true + # Commonly used screens these days easily fit more than 80 characters. Metrics/LineLength: Max: 120 diff --git a/Gemfile b/Gemfile index 777c25c45..697f6748e 100644 --- a/Gemfile +++ b/Gemfile @@ -262,7 +262,7 @@ group :test do # Cucumber (integration tests) gem "capybara", "2.7.1" - gem "database_cleaner" , "1.5.3" + gem "database_cleaner", "1.5.3" gem "selenium-webdriver", "2.47.1" # General helpers From c6a9f38442af8b8e38374cf54cbefc84c7dba275 Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Thu, 12 May 2016 04:06:35 +0200 Subject: [PATCH 50/51] Freeze all versions for consistency --- Gemfile | 6 +++--- Gemfile.lock | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index 697f6748e..160cf86e9 100644 --- a/Gemfile +++ b/Gemfile @@ -24,7 +24,7 @@ gem "json-schema", "2.6.1" gem "devise", "3.5.6" gem "devise_lastseenable", "0.0.6" -gem "devise-token_authenticatable", "~> 0.4.0" +gem "devise-token_authenticatable", "0.4.6" # Captcha @@ -147,8 +147,8 @@ gem "omniauth-wordpress", "0.2.2" gem "active_model_serializers", "0.9.5" # XMPP chat dependencies -gem "diaspora-vines", "~> 0.2.0.develop" -gem "rails-assets-diaspora_jsxc", "~> 0.1.4", source: "https://rails-assets.org" +gem "diaspora-vines", "0.2.0.develop.4" +gem "rails-assets-diaspora_jsxc", "0.1.4", source: "https://rails-assets.org" # Tags diff --git a/Gemfile.lock b/Gemfile.lock index 2247426f1..400612c56 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -811,9 +811,9 @@ DEPENDENCIES cucumber-rails (= 1.4.3) database_cleaner (= 1.5.3) devise (= 3.5.6) - devise-token_authenticatable (~> 0.4.0) + devise-token_authenticatable (= 0.4.6) devise_lastseenable (= 0.0.6) - diaspora-vines (~> 0.2.0.develop) + diaspora-vines (= 0.2.0.develop.4) diaspora_federation-rails (= 0.0.13) diaspora_federation-test (= 0.0.13) entypo-rails (= 2.2.3) @@ -870,7 +870,7 @@ DEPENDENCIES rack-rewrite (= 1.5.1) rack-ssl (= 1.4.1) rails (= 4.2.6) - rails-assets-diaspora_jsxc (~> 0.1.4)! + rails-assets-diaspora_jsxc (= 0.1.4)! rails-assets-highlightjs (= 9.2.0)! rails-assets-jakobmattsson--jquery-elastic (= 1.6.11)! rails-assets-jasmine-ajax (= 3.2.0)! From 5378e8c8e7d04a66d8dc3277540141ca98ab98fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Thu, 12 May 2016 13:15:51 +0200 Subject: [PATCH 51/51] bump rails-assets-markdown-it --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 160cf86e9..faff0c8e7 100644 --- a/Gemfile +++ b/Gemfile @@ -93,7 +93,7 @@ gem "js-routes", "1.2.5" source "https://rails-assets.org" do gem "rails-assets-jquery", "1.12.0" # Should be kept in sync with jquery-rails - gem "rails-assets-markdown-it", "6.0.0" + gem "rails-assets-markdown-it", "6.0.1" gem "rails-assets-markdown-it-hashtag", "0.4.0" gem "rails-assets-markdown-it-diaspora-mention", "0.4.0" gem "rails-assets-markdown-it-sanitizer", "0.4.1" diff --git a/Gemfile.lock b/Gemfile.lock index 400612c56..f022f0346 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -589,7 +589,7 @@ GEM rails-assets-jquery.ui (1.11.4) rails-assets-jquery (>= 1.6) rails-assets-markdown-it--markdown-it-for-inline (0.1.1) - rails-assets-markdown-it (6.0.0) + rails-assets-markdown-it (6.0.1) rails-assets-markdown-it-diaspora-mention (0.4.0) rails-assets-markdown-it-hashtag (0.4.0) rails-assets-markdown-it-sanitizer (0.4.1) @@ -878,7 +878,7 @@ DEPENDENCIES rails-assets-jquery (= 1.12.0)! rails-assets-jquery-placeholder (= 2.3.1)! rails-assets-jquery-textchange (= 0.2.3)! - rails-assets-markdown-it (= 6.0.0)! + rails-assets-markdown-it (= 6.0.1)! rails-assets-markdown-it--markdown-it-for-inline (= 0.1.1)! rails-assets-markdown-it-diaspora-mention (= 0.4.0)! rails-assets-markdown-it-hashtag (= 0.4.0)!