Skip to content

Commit

Permalink
Merge pull request #1371 from betagouv/fix-1370
Browse files Browse the repository at this point in the history
[Fix #1370] downgrade spreadsheet architecture to support date in ODS
  • Loading branch information
gregoirenovel authored Jan 29, 2018
2 parents 5a56fe0 + da784aa commit 3fbee9f
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 12 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ gem 'smart_listing'

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'
# For Markdown support in apipie
Expand Down
18 changes: 7 additions & 11 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,6 @@ GEM
htmlentities (~> 4.3.1)
nokogiri (>= 1.4.1)
rubyzip (~> 1.0.0)
axlsx_styler (0.1.7)
activesupport (>= 3.1)
axlsx (~> 2.0)
bcrypt (3.1.11)
bindata (2.4.1)
bindex (0.5.0)
Expand Down Expand Up @@ -585,10 +582,10 @@ GEM
rgeo (1.0.0)
rgeo-geojson (2.0.0)
rgeo (~> 1.0)
rodf (1.0.0)
activesupport (>= 3.0)
builder (>= 3.0)
rubyzip (>= 1.0)
rodf (0.3.7)
activesupport (>= 3.0, < 6.0)
builder (~> 3.0)
rubyzip (~> 1.0)
rspec (3.5.0)
rspec-core (~> 3.5.0)
rspec-expectations (~> 3.5.0)
Expand Down Expand Up @@ -676,10 +673,9 @@ GEM
jquery-rails
kaminari (~> 0.17)
rails (>= 3.2)
spreadsheet_architect (2.0.2)
spreadsheet_architect (1.4.8)
axlsx (>= 2.0)
axlsx_styler (>= 0.1.7)
rodf (>= 1.0.0)
rodf (= 0.3.7)
spring (2.0.2)
activesupport (>= 4.2)
spring-commands-rspec (1.0.4)
Expand Down Expand Up @@ -828,7 +824,7 @@ DEPENDENCIES
simple_form
skylight
smart_listing
spreadsheet_architect
spreadsheet_architect (~> 1.4.8)
spring
spring-commands-rspec
therubyracer
Expand Down

0 comments on commit 3fbee9f

Please sign in to comment.