kotovalexarian-likes-github
/
carrierwaveuploader--carrierwave
mirror of https://github.com/carrierwaveuploader/carrierwave.git
1
0
Fork 0
Code Releases Activity

Remove Support for Merb

This commit is contained in:
Abdelkader Boudih 2021-04-19 08:37:59 +00:00
parent 1c7bdd2e32
commit 7791f9e999
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -5,6 +5,9 @@ This project adheres to [Semantic Versioning](http://semver.org/).
## [Unreleased]
## Changed
* Remove support for Merb (@seuros [#2564](https://github.com/carrierwaveuploader/carrierwave/pull/2564))
## 2.2.1 - 2021-03-30
### Changed
* Replace mimemagic with marcel due to licensing concern (@pjmartorell [#2551](https://github.com/carrierwaveuploader/carrierwave/pull/2551), [#2548](https://github.com/carrierwaveuploader/carrierwave/issues/2548))

11
lib/carrierwave.rb
View File

@ -25,16 +25,7 @@ module CarrierWave
end
if defined?(Merb)
CarrierWave.root = Merb.dir_for(:public)
Merb::BootLoader.before_app_loads do
# Setup path for uploaders and load all of them before classes are loaded
Merb.push_path(:uploaders, Merb.root / 'app' / 'uploaders', '*.rb')
Dir.glob(File.join(Merb.load_paths[:uploaders])).each {|f| require f }
end
elsif defined?(Jets)
if defined?(Jets)
module CarrierWave
class Turbine < Jets::Turbine