mirror of
https://github.com/scinote-eln/scinote-web.git
synced 2024-12-27 10:14:17 +08:00
Merge pull request #774 from Ducz0r/lm-sci-1376
Update delayed_paperclip library [SCI-1376]
This commit is contained in:
commit
1cabe84910
2 changed files with 13 additions and 5 deletions
4
Gemfile
4
Gemfile
|
@ -57,7 +57,9 @@ gem 'deface', '~> 1.0'
|
|||
gem 'nokogiri' # HTML/XML parser
|
||||
gem 'sneaky-save', git: 'https://github.com/einzige/sneaky-save'
|
||||
gem 'rails_autolink', '~> 1.1', '>= 1.1.6'
|
||||
gem 'delayed_paperclip'
|
||||
gem 'delayed_paperclip',
|
||||
git: 'https://github.com/jrgifford/delayed_paperclip.git',
|
||||
ref: 'fcf574c'
|
||||
gem 'rubyzip'
|
||||
gem 'activerecord-import'
|
||||
|
||||
|
|
14
Gemfile.lock
14
Gemfile.lock
|
@ -5,6 +5,15 @@ GIT
|
|||
sneaky-save (0.1.2)
|
||||
activerecord (>= 3.2.0)
|
||||
|
||||
GIT
|
||||
remote: https://github.com/jrgifford/delayed_paperclip.git
|
||||
revision: fcf574c1188213d3c8fce934fd52861a8ba080cb
|
||||
ref: fcf574c
|
||||
specs:
|
||||
delayed_paperclip (3.0.1)
|
||||
activejob (>= 4.2)
|
||||
paperclip (>= 3.3)
|
||||
|
||||
GEM
|
||||
remote: http://rubygems.org/
|
||||
specs:
|
||||
|
@ -117,9 +126,6 @@ GEM
|
|||
delayed_job_active_record (4.1.0)
|
||||
activerecord (>= 3.0, < 5)
|
||||
delayed_job (>= 3.0, < 5)
|
||||
delayed_paperclip (3.0.1)
|
||||
activejob (>= 4.2)
|
||||
paperclip (>= 3.3)
|
||||
devise (3.5.6)
|
||||
bcrypt (~> 3.0)
|
||||
orm_adapter (~> 0.1)
|
||||
|
@ -360,7 +366,7 @@ DEPENDENCIES
|
|||
commit_param_routing
|
||||
deface (~> 1.0)
|
||||
delayed_job_active_record
|
||||
delayed_paperclip
|
||||
delayed_paperclip!
|
||||
devise (= 3.5.6)
|
||||
devise-async
|
||||
devise_invitable
|
||||
|
|
Loading…
Reference in a new issue