scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-12 01:46:55 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #915 from biosistemika/lm-fix-wicked-pdf-version

Browse source 
Fix Wicked PDF version
This commit is contained in:
Luka Murn 2017-12-20 11:08:03 +01:00 committed by GitHub
commit 44f0336a96
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -51,7 +51,7 @@ gem 'commit_param_routing' # Enables different submit actions in the same form t
gem 'kaminari' gem 'kaminari'
gem 'i18n-js', '~> 3.0' # Localization in javascript files gem 'i18n-js', '~> 3.0' # Localization in javascript files
gem 'roo', '~> 2.7.1' # Spreadsheet parser gem 'roo', '~> 2.7.1' # Spreadsheet parser
gem 'wicked_pdf' gem 'wicked_pdf', '~> 1.0.6'
gem 'silencer' # Silence certain Rails logs gem 'silencer' # Silence certain Rails logs
gem 'wkhtmltopdf-heroku' gem 'wkhtmltopdf-heroku'
gem 'remotipart', '~> 1.2' # Async file uploads gem 'remotipart', '~> 1.2' # Async file uploads

4
Gemfile.lock
View file

@ -448,7 +448,7 @@ GEM
websocket-extensions (>= 0.1.0) websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.3) websocket-extensions (0.1.3)
whacamole (1.2.0) whacamole (1.2.0)
wicked_pdf (1.1.0) wicked_pdf (1.0.6)
wkhtmltopdf-heroku (2.12.4.0) wkhtmltopdf-heroku (2.12.4.0)
xpath (2.1.0) xpath (2.1.0)
nokogiri (~> 1.3) nokogiri (~> 1.3)
@ -546,7 +546,7 @@ DEPENDENCIES
uglifier (>= 1.3.0) uglifier (>= 1.3.0)
underscore-rails underscore-rails
whacamole whacamole
wicked_pdf wicked_pdf (~> 1.0.6)
wkhtmltopdf-heroku wkhtmltopdf-heroku
yomu yomu