mirror of
https://github.com/scinote-eln/scinote-web.git
synced 2024-09-20 14:45:56 +08:00
Update Paperclip library to 5.3 version
This commit is contained in:
parent
9751610710
commit
159078170a
2
Gemfile
2
Gemfile
|
@ -71,7 +71,7 @@ gem 'jbuilder' # JSON structures via a Builder-style DSL
|
||||||
gem 'activerecord-import'
|
gem 'activerecord-import'
|
||||||
gem 'scenic', '~> 1.4'
|
gem 'scenic', '~> 1.4'
|
||||||
|
|
||||||
gem 'paperclip', '~> 5.1' # File attachment, image attachment library
|
gem 'paperclip', '~> 5.3' # File attachment, image attachment library
|
||||||
gem 'aws-sdk', '~> 2'
|
gem 'aws-sdk', '~> 2'
|
||||||
|
|
||||||
gem 'delayed_job_active_record'
|
gem 'delayed_job_active_record'
|
||||||
|
|
14
Gemfile.lock
14
Gemfile.lock
|
@ -148,8 +148,6 @@ GEM
|
||||||
mail
|
mail
|
||||||
climate_control (0.2.0)
|
climate_control (0.2.0)
|
||||||
cliver (0.3.2)
|
cliver (0.3.2)
|
||||||
cocaine (0.5.8)
|
|
||||||
climate_control (>= 0.0.3, < 1.0)
|
|
||||||
coderay (1.1.2)
|
coderay (1.1.2)
|
||||||
coffee-rails (4.2.2)
|
coffee-rails (4.2.2)
|
||||||
coffee-script (>= 2.2.0)
|
coffee-script (>= 2.2.0)
|
||||||
|
@ -227,7 +225,7 @@ GEM
|
||||||
activesupport (>= 4.2.0)
|
activesupport (>= 4.2.0)
|
||||||
hammerjs-rails (2.0.8)
|
hammerjs-rails (2.0.8)
|
||||||
hashie (3.5.7)
|
hashie (3.5.7)
|
||||||
i18n (0.9.3)
|
i18n (0.9.5)
|
||||||
concurrent-ruby (~> 1.0)
|
concurrent-ruby (~> 1.0)
|
||||||
i18n-js (3.0.3)
|
i18n-js (3.0.3)
|
||||||
i18n (~> 0.6, >= 0.6.6)
|
i18n (~> 0.6, >= 0.6.6)
|
||||||
|
@ -320,12 +318,12 @@ GEM
|
||||||
oauth2 (~> 1.1)
|
oauth2 (~> 1.1)
|
||||||
omniauth (~> 1.2)
|
omniauth (~> 1.2)
|
||||||
orm_adapter (0.5.0)
|
orm_adapter (0.5.0)
|
||||||
paperclip (5.2.1)
|
paperclip (5.3.0)
|
||||||
activemodel (>= 4.2.0)
|
activemodel (>= 4.2.0)
|
||||||
activesupport (>= 4.2.0)
|
activesupport (>= 4.2.0)
|
||||||
cocaine (~> 0.5.5)
|
|
||||||
mime-types
|
mime-types
|
||||||
mimemagic (~> 0.3.0)
|
mimemagic (~> 0.3.0)
|
||||||
|
terrapin (~> 0.6.0)
|
||||||
parallel (1.12.1)
|
parallel (1.12.1)
|
||||||
parser (2.4.0.2)
|
parser (2.4.0.2)
|
||||||
ast (~> 2.3)
|
ast (~> 2.3)
|
||||||
|
@ -485,6 +483,8 @@ GEM
|
||||||
ruby-progressbar (~> 1.9)
|
ruby-progressbar (~> 1.9)
|
||||||
sourcemap (~> 0.1)
|
sourcemap (~> 0.1)
|
||||||
stream (0.5)
|
stream (0.5)
|
||||||
|
terrapin (0.6.0)
|
||||||
|
climate_control (>= 0.0.3, < 1.0)
|
||||||
thor (0.20.0)
|
thor (0.20.0)
|
||||||
thread_safe (0.3.6)
|
thread_safe (0.3.6)
|
||||||
tilt (2.0.8)
|
tilt (2.0.8)
|
||||||
|
@ -492,7 +492,7 @@ GEM
|
||||||
railties (>= 3.1.1)
|
railties (>= 3.1.1)
|
||||||
turbolinks (2.5.4)
|
turbolinks (2.5.4)
|
||||||
coffee-rails
|
coffee-rails
|
||||||
tzinfo (1.2.4)
|
tzinfo (1.2.5)
|
||||||
thread_safe (~> 0.1)
|
thread_safe (~> 0.1)
|
||||||
uglifier (4.1.4)
|
uglifier (4.1.4)
|
||||||
execjs (>= 0.3.0, < 3)
|
execjs (>= 0.3.0, < 3)
|
||||||
|
@ -575,7 +575,7 @@ DEPENDENCIES
|
||||||
nokogiri (~> 1.8.1)
|
nokogiri (~> 1.8.1)
|
||||||
omniauth
|
omniauth
|
||||||
omniauth-linkedin-oauth2
|
omniauth-linkedin-oauth2
|
||||||
paperclip (~> 5.1)
|
paperclip (~> 5.3)
|
||||||
pg (~> 0.18)
|
pg (~> 0.18)
|
||||||
phantomjs
|
phantomjs
|
||||||
poltergeist
|
poltergeist
|
||||||
|
|
Loading…
Reference in a new issue