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

Merge pull request #1371 from betagouv/fix-1370

Browse source 
[Fix #1370] downgrade spreadsheet architecture to support date in ODS
This commit is contained in:
gregoirenovel 2018-01-29 18:39:38 +01:00 committed by GitHub
commit 3fbee9fd0d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -80,7 +80,7 @@ gem 'smart_listing'
gem 'bootstrap-wysihtml5-rails', '~> 0.3.3.8' gem 'bootstrap-wysihtml5-rails', '~> 0.3.3.8'
gem 'spreadsheet_architect' gem 'spreadsheet_architect', '~> 1.4.8' # https://github.com/westonganger/spreadsheet_architect/issues/14
gem 'apipie-rails' gem 'apipie-rails'
# For Markdown support in apipie # For Markdown support in apipie

18
Gemfile.lock
View file

@ -90,9 +90,6 @@ GEM
htmlentities (~> 4.3.1) htmlentities (~> 4.3.1)
nokogiri (>= 1.4.1) nokogiri (>= 1.4.1)
rubyzip (~> 1.0.0) rubyzip (~> 1.0.0)
axlsx_styler (0.1.7)
activesupport (>= 3.1)
axlsx (~> 2.0)
bcrypt (3.1.11) bcrypt (3.1.11)
bindata (2.4.1) bindata (2.4.1)
bindex (0.5.0) bindex (0.5.0)
@ -585,10 +582,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 (1.0.0) rodf (0.3.7)
activesupport (>= 3.0) activesupport (>= 3.0, < 6.0)
builder (>= 3.0) builder (~> 3.0)
rubyzip (>= 1.0) rubyzip (~> 1.0)
rspec (3.5.0) rspec (3.5.0)
rspec-core (~> 3.5.0) rspec-core (~> 3.5.0)
rspec-expectations (~> 3.5.0) rspec-expectations (~> 3.5.0)
@ -676,10 +673,9 @@ GEM
jquery-rails jquery-rails
kaminari (~> 0.17) kaminari (~> 0.17)
rails (>= 3.2) rails (>= 3.2)
spreadsheet_architect (2.0.2) spreadsheet_architect (1.4.8)
axlsx (>= 2.0) axlsx (>= 2.0)
axlsx_styler (>= 0.1.7) rodf (= 0.3.7)
rodf (>= 1.0.0)
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)
@ -828,7 +824,7 @@ DEPENDENCIES
simple_form simple_form
skylight skylight
smart_listing smart_listing
spreadsheet_architect spreadsheet_architect (~> 1.4.8)
spring spring
spring-commands-rspec spring-commands-rspec
therubyracer therubyracer