DGNum/demarches-normaliennes
13
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Merge pull request #2533 from betagouv/frederic/fix_1372-bump_spreadsheet_architect

Browse source 
[Fix #1372] Bump spreadsheet architect and axlsx
This commit is contained in:
Pierre de La Morinerie 2018-09-06 18:16:06 +02:00 • committed by GitHub
commit 075a28d36a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Gemfile
View file

@ -88,7 +88,8 @@ gem 'groupdate'
gem 'bootstrap-wysihtml5-rails', '~> 0.3.3.8' gem 'bootstrap-wysihtml5-rails', '~> 0.3.3.8'
gem 'spreadsheet_architect', '~> 1.4.8' # https://github.com/westonganger/spreadsheet_architect/issues/14 gem 'spreadsheet_architect'
gem 'axlsx', '~> 3.0.0.pre' # https://github.com/randym/axlsx/issues/501#issuecomment-373640365
gem 'apipie-rails' gem 'apipie-rails'
# For Markdown support in apipie # For Markdown support in apipie

34
Gemfile.lock
View file

@ -96,10 +96,14 @@ GEM
attr_required (1.0.1) attr_required (1.0.1)
autoprefixer-rails (8.3.0) autoprefixer-rails (8.3.0)
execjs execjs
axlsx (2.0.1) axlsx (3.0.0.pre)
htmlentities (~> 4.3.1) htmlentities (~> 4.3, >= 4.3.4)
nokogiri (>= 1.4.1) mimemagic (~> 0.3)
rubyzip (~> 1.0.0) nokogiri (~> 1.8, >= 1.8.2)
rubyzip (~> 1.2, >= 1.2.1)
axlsx_styler (0.2.0)
activesupport (>= 3.1)
axlsx (>= 2.0, < 4)
bcrypt (3.1.12) bcrypt (3.1.12)
bindata (2.4.3) bindata (2.4.3)
bindex (0.5.0) bindex (0.5.0)
@ -632,10 +636,10 @@ GEM
rgeo (1.0.0) rgeo (1.0.0)
rgeo-geojson (2.0.0) rgeo-geojson (2.0.0)
rgeo (~> 1.0) rgeo (~> 1.0)
rodf (0.3.7) rodf (1.0.0)
activesupport (>= 3.0, < 6.0) activesupport (>= 3.0)
builder (~> 3.0) builder (>= 3.0)
rubyzip (~> 1.0) rubyzip (>= 1.0)
rspec (3.7.0) rspec (3.7.0)
rspec-core (~> 3.7.0) rspec-core (~> 3.7.0)
rspec-expectations (~> 3.7.0) rspec-expectations (~> 3.7.0)
@ -673,7 +677,7 @@ GEM
ruby_dep (1.5.0) ruby_dep (1.5.0)
ruby_parser (3.11.0) ruby_parser (3.11.0)
sexp_processor (~> 4.9) sexp_processor (~> 4.9)
rubyzip (1.0.0) rubyzip (1.2.2)
safe_yaml (1.0.4) safe_yaml (1.0.4)
sanitize-url (0.1.4) sanitize-url (0.1.4)
sass (3.5.6) sass (3.5.6)
@ -722,9 +726,10 @@ GEM
jquery-rails jquery-rails
kaminari (>= 0.17) kaminari (>= 0.17)
rails (>= 3.2) rails (>= 3.2)
spreadsheet_architect (1.4.8) spreadsheet_architect (3.1.0)
axlsx (>= 2.0) axlsx (>= 2, < 4)
rodf (= 0.3.7) axlsx_styler (>= 0.1.7, < 2)
rodf (>= 1.0.0, < 2)
spring (2.0.2) spring (2.0.2)
activesupport (>= 4.2) activesupport (>= 4.2)
spring-commands-rspec (1.0.4) spring-commands-rspec (1.0.4)
@ -809,6 +814,7 @@ DEPENDENCIES
administrate administrate
after_party after_party
apipie-rails apipie-rails
axlsx (~> 3.0.0.pre)
bootstrap-sass (~> 3.3.5) bootstrap-sass (~> 3.3.5)
bootstrap-wysihtml5-rails (~> 0.3.3.8) bootstrap-wysihtml5-rails (~> 0.3.3.8)
brakeman brakeman
@ -885,7 +891,7 @@ DEPENDENCIES
simple_form simple_form
skylight skylight
smart_listing smart_listing
spreadsheet_architect (~> 1.4.8) spreadsheet_architect
spring spring
spring-commands-rspec spring-commands-rspec
therubyracer therubyracer
@ -902,4 +908,4 @@ DEPENDENCIES
xray-rails xray-rails
BUNDLED WITH BUNDLED WITH
1.16.2 1.16.3