From 609659bd29e91866f7b3250a14bdfba0fadfffa5 Mon Sep 17 00:00:00 2001
From: echarp <manu@echarp.org>
Date: Tue, 21 Aug 2018 22:30:59 +0200
Subject: [PATCH] The ice cube gem was overriding too strongly the default date
 formatting

---
 Gemfile      |  3 ++-
 Gemfile.lock | 15 ++++++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/Gemfile b/Gemfile
index 4ed140aa..ee080f33 100644
--- a/Gemfile
+++ b/Gemfile
@@ -14,7 +14,8 @@ gem 'simple_calendar'
 gem 'icalendar'
 
 # The recurrence management library
-gem 'ice_cube'
+# Using a forked one, that corrects https://github.com/seejohnrun/ice_cube/issues/431
+gem 'ice_cube', github: 'Promptus/ice_cube'
 
 gem 'rails', '>= 5.1.4'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 86aed393..fc22d800 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,3 +1,9 @@
+GIT
+  remote: https://github.com/Promptus/ice_cube.git
+  revision: 86ff5e1b1298d772aa2b79cffb408b3dafbc9df9
+  specs:
+    ice_cube (0.16.1)
+
 GEM
   remote: https://rubygems.org/
   remote: https://rails-assets.org/
@@ -200,7 +206,6 @@ GEM
     i18n-active_record (0.2.2)
       i18n (>= 0.5.0)
     icalendar (2.4.1)
-    ice_cube (0.16.3)
     inherited_resources (1.9.0)
       actionpack (>= 4.2, < 5.3)
       has_scope (~> 0.6)
@@ -409,9 +414,9 @@ GEM
       railties (>= 3.1.1)
     tinymce-rails-langs (4.20180103)
       tinymce-rails (~> 4.1, >= 4.1.10)
-    turbolinks (5.1.1)
-      turbolinks-source (~> 5.1)
-    turbolinks-source (5.1.0)
+    turbolinks (5.2.0)
+      turbolinks-source (~> 5.2)
+    turbolinks-source (5.2.0)
     twitter (6.2.0)
       addressable (~> 2.3)
       buftok (~> 0.2.0)
@@ -477,7 +482,7 @@ DEPENDENCIES
   http_accept_language
   i18n-active_record
   icalendar
-  ice_cube
+  ice_cube!
   jbuilder (~> 2.5)
   jquery-ui-rails
   kramdown