From 57df02426683b4df6cb0eb3ecb033ef32881dc02 Mon Sep 17 00:00:00 2001
From: Paul Chavard <git@paul.chavard.net>
Date: Wed, 4 Mar 2020 10:14:16 +0100
Subject: [PATCH] Bring back activestorage-openstack to upstream

---
 Gemfile      |  2 +-
 Gemfile.lock | 18 ++++++------------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/Gemfile b/Gemfile
index a03b04aab..d629ba148 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,7 +5,7 @@ gem 'actiontext', git: 'https://github.com/kobaltz/actiontext.git', branch: 'arc
 gem 'active_link_to' # Automatically set a class on active links
 gem 'active_model_serializers'
 gem 'active_storage_validations'
-gem 'activestorage-openstack', git: 'https://github.com/tchak/activestorage-openstack.git', branch: 'fix-activestorage-filename-wrap'
+gem 'activestorage-openstack'
 gem 'administrate'
 gem 'after_party'
 gem 'anchored'
diff --git a/Gemfile.lock b/Gemfile.lock
index 292ab7bf7..7e907627b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -15,17 +15,6 @@ GIT
       open4 (~> 1.3.4)
       rake
 
-GIT
-  remote: https://github.com/tchak/activestorage-openstack.git
-  revision: 907582f14d785fb965baebe9524c0162b1bd57c9
-  branch: fix-activestorage-filename-wrap
-  specs:
-    activestorage-openstack (1.3.0)
-      fog-openstack (~> 1.0)
-      marcel
-      mime-types
-      rails (>= 5.2.2)
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -77,6 +66,11 @@ GEM
       actionpack (= 5.2.4.1)
       activerecord (= 5.2.4.1)
       marcel (~> 0.3.1)
+    activestorage-openstack (1.4.1)
+      fog-openstack (~> 1.0)
+      marcel
+      mime-types
+      rails (>= 5.2.2)
     activesupport (5.2.4.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
@@ -723,7 +717,7 @@ DEPENDENCIES
   active_link_to
   active_model_serializers
   active_storage_validations
-  activestorage-openstack!
+  activestorage-openstack
   administrate
   after_party
   anchored