Skip to content

Commit

Permalink
Merge pull request #1646 from SpeciesFileGroup/dependabot/bundler/cha…
Browse files Browse the repository at this point in the history
…rtkick-3.4.0

Bump chartkick from 3.3.1 to 3.4.0
  • Loading branch information
LocoDelAssembly committed Aug 12, 2020
2 parents 6b10807 + 0061215 commit fd9dc6d
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,11 @@ This project <em>does not yet</em> adheres to [Semantic Versioning](https://semv
### Changed
- New combination redirect to the valid name [#1639]
- Rename comprehensive specimen digitization task card
- Updated chartkick gem [#1646]

[#1615]: https://github.com/SpeciesFileGroup/taxonworks/issues/1615
[#1639]: https://github.com/SpeciesFileGroup/taxonworks/issues/1639
[#1646]: https://github.com/SpeciesFileGroup/taxonworks/pull/1646

## [0.12.13] - 2020-08-04

Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ gem 'serrano', '~> 0.6.0'
gem 'pdf-reader', '~> 2.2'

# UI/UX
gem 'chartkick', '~> 3.3'
gem 'chartkick', '~> 3.4'
gem 'groupdate', '~> 4.2'
gem 'dropzonejs-rails', '~> 0.8.1'
gem 'kaminari', '~> 1.2.0'
Expand Down
4 changes: 2 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ GEM
rack-test (>= 0.6.3)
regexp_parser (~> 1.5)
xpath (~> 3.2)
chartkick (3.3.1)
chartkick (3.4.0)
childprocess (3.0.0)
chronic (0.10.2)
chunky_png (1.3.11)
Expand Down Expand Up @@ -566,7 +566,7 @@ DEPENDENCIES
bundler (~> 2.0)
byebug (~> 11.1)
capybara (~> 3.18)
chartkick (~> 3.3)
chartkick (~> 3.4)
chronic (~> 0.10.2)
chunky_png (~> 1.3.11)
citeproc-ruby (~> 1.1.10)
Expand Down

0 comments on commit fd9dc6d

Please sign in to comment.