Merge pull request #4855 from tchak/update-activestorage-openstack
Bring back activestorage-openstack to upstream
This commit is contained in:
commit
799ea628de
2 changed files with 7 additions and 13 deletions
2
Gemfile
2
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_link_to' # Automatically set a class on active links
|
||||||
gem 'active_model_serializers'
|
gem 'active_model_serializers'
|
||||||
gem 'active_storage_validations'
|
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 'administrate'
|
||||||
gem 'after_party'
|
gem 'after_party'
|
||||||
gem 'anchored'
|
gem 'anchored'
|
||||||
|
|
18
Gemfile.lock
18
Gemfile.lock
|
@ -15,17 +15,6 @@ GIT
|
||||||
open4 (~> 1.3.4)
|
open4 (~> 1.3.4)
|
||||||
rake
|
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
|
GEM
|
||||||
remote: https://rubygems.org/
|
remote: https://rubygems.org/
|
||||||
specs:
|
specs:
|
||||||
|
@ -77,6 +66,11 @@ GEM
|
||||||
actionpack (= 5.2.4.1)
|
actionpack (= 5.2.4.1)
|
||||||
activerecord (= 5.2.4.1)
|
activerecord (= 5.2.4.1)
|
||||||
marcel (~> 0.3.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)
|
activesupport (5.2.4.1)
|
||||||
concurrent-ruby (~> 1.0, >= 1.0.2)
|
concurrent-ruby (~> 1.0, >= 1.0.2)
|
||||||
i18n (>= 0.7, < 2)
|
i18n (>= 0.7, < 2)
|
||||||
|
@ -723,7 +717,7 @@ DEPENDENCIES
|
||||||
active_link_to
|
active_link_to
|
||||||
active_model_serializers
|
active_model_serializers
|
||||||
active_storage_validations
|
active_storage_validations
|
||||||
activestorage-openstack!
|
activestorage-openstack
|
||||||
administrate
|
administrate
|
||||||
after_party
|
after_party
|
||||||
anchored
|
anchored
|
||||||
|
|
Loading…
Reference in a new issue