From 11d30f9066e565689514a9d18c5dec4d6115ed09 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Tue, 6 Mar 2018 00:27:09 +0100 Subject: [PATCH 1/3] Bump rack-protection --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index b91f009e7..01aa47ba7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -489,7 +489,7 @@ GEM multi_json (>= 1.3.6) rack (>= 1.1) rack-piwik (0.3.0) - rack-protection (2.0.0) + rack-protection (2.0.1) rack rack-rewrite (1.5.1) rack-ssl (1.4.1) From 0b0070abebb3d45d9c20c7e70f385dcc5f477672 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Tue, 6 Mar 2018 00:28:10 +0100 Subject: [PATCH 2/3] Bump yard --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 01aa47ba7..bd8dccf72 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -759,7 +759,7 @@ GEM will_paginate (3.1.6) xpath (2.1.0) nokogiri (~> 1.3) - yard (0.9.9) + yard (0.9.12) PLATFORMS ruby From 3bb6d6d67779e8005e52ddd3acc8571b471b9819 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Tue, 6 Mar 2018 00:44:16 +0100 Subject: [PATCH 3/3] Bump rails-i18n fixes #7527 closes #7731 --- Changelog.md | 1 + Gemfile | 2 +- Gemfile.lock | 14 +++++++------- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Changelog.md b/Changelog.md index 2835f4c73..4c29c8076 100644 --- a/Changelog.md +++ b/Changelog.md @@ -10,6 +10,7 @@ * Fixed a compatiblitiy issue with non-diaspora\* webfingers [#7718](https://github.com/diaspora/diaspora/pull/7718) * Don't retry federation for accounts without a valid public key [#7717](https://github.com/diaspora/diaspora/pull/7717) * Fix stream generation for tagged posts with many followed tags [#7715](https://github.com/diaspora/diaspora/pull/7715) +* Fix incomplete Occitan date localizations [#7731](https://github.com/diaspora/diaspora/pull/7731) ## Features * Add basic html5 audio/video embedding support [#6418](https://github.com/diaspora/diaspora/pull/6418) diff --git a/Gemfile b/Gemfile index acf18273c..4228d3bfa 100644 --- a/Gemfile +++ b/Gemfile @@ -128,7 +128,7 @@ gem "markdown-it-html5-embed", "1.0.0" gem "http_accept_language", "2.1.1" gem "i18n-inflector-rails", "1.0.7" -gem "rails-i18n", "5.0.4" +gem "rails-i18n", "5.1.1" # Mail diff --git a/Gemfile.lock b/Gemfile.lock index bd8dccf72..442ae623b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -187,7 +187,7 @@ GEM entypo-rails (3.0.0) railties (>= 4.1, < 6) equalizer (0.0.11) - erubi (1.7.0) + erubi (1.7.1) eslintrb (2.1.0) execjs multi_json (>= 1.3) @@ -217,7 +217,7 @@ GEM http-cookie (~> 1.0.0) faraday_middleware (0.12.2) faraday (>= 0.7.4, < 1.0) - ffi (1.9.22) + ffi (1.9.23) fixture_builder (0.5.0) activerecord (>= 2) activesupport (>= 2) @@ -494,7 +494,7 @@ GEM rack-rewrite (1.5.1) rack-ssl (1.4.1) rack - rack-test (0.8.2) + rack-test (0.8.3) rack (>= 1.0, < 3) rails (5.1.4) actioncable (= 5.1.4) @@ -563,9 +563,9 @@ GEM nokogiri (>= 1.6) rails-html-sanitizer (1.0.3) loofah (~> 2.0) - rails-i18n (5.0.4) - i18n (~> 0.7) - railties (~> 5.0) + rails-i18n (5.1.1) + i18n (>= 0.7, < 2) + railties (>= 5.0, < 6) rails-timeago (2.16.0) actionpack (>= 3.1) activesupport (>= 3.1) @@ -869,7 +869,7 @@ DEPENDENCIES rails-assets-markdown-it-sup (= 1.0.0)! rails-assets-perfect-scrollbar (= 0.6.16)! rails-controller-testing (= 1.0.2) - rails-i18n (= 5.0.4) + rails-i18n (= 5.1.1) rails-timeago (= 2.16.0) rb-fsevent (= 0.10.2) rb-inotify (= 0.9.10)