chartkick 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06c3f38fbf6ee6a1981868e6c8b66d41b622573e
-  data.tar.gz: 1cd7e3761a9cfa989ae2add1f2715103edd8212a
+  metadata.gz: 848d18904d57decb720961b641517820104fd6cc
+  data.tar.gz: 878e5deed5566486939c041003fffb354c1ad1c4
 SHA512:
-  metadata.gz: 20b26ec98f97e04d04ca157c4731fbb035c12bcb93c30ea78a3f9d7ca5c0d96f859e82ba99a773cd4e413e988211dfcf46c6e914769151a9fa0b706dd2186d27
-  data.tar.gz: f7a0cc574921407145c356c91b987834e60d6e22677b005ff97d4185d8270c9fabbc4a8b8d36a310cecb400760b578e974c799ea1f67d3e644bffaec452a3138
+  metadata.gz: 1916921d38f7cddb051f9e8ac1d6599449f95c4b30d2b6168f80e1155a3c405c53ecd10521b88202298261df6a211d2c3747af0f239083c745d1a072510442c3
+  data.tar.gz: 6a54d67e004bd435689b787be2063be304f4ee0b1e6d52fc81b2ebcd3f000b23f703b676332980e7eaa399dd725fb94b11fe47d5e62a610794b977e77934f69c

data/CHANGELOG.md

@@ -1,4 +1,8 @@
-## 2.1.0 [unreleased]
+## 2.1.1
+
+- Use custom version of Chart.js to fix label overlap
+
+## 2.1.0
 
 - Added basic support for new Google Charts loader
 - Added `configure` function

data/lib/chartkick/version.rb

@@ -1,3 +1,3 @@
 module Chartkick
-  VERSION = "2.1.0"
+  VERSION = "2.1.1"
 end

data/vendor/assets/javascripts/Chart.bundle.js

@@ -14609,7 +14609,7 @@ module.exports = function(Chart) {
 				if (me.options.time.max) {
 					me.ticks.push(me.lastTick.clone());
 					me.scaleSizeInUnits = me.lastTick.diff(me.ticks[0], me.tickUnit, true);
-				} else {
+				} else if (me.scaleSizeInUnits === 0) {
 					me.ticks.push(me.lastTick.clone());
 					me.scaleSizeInUnits = me.lastTick.diff(me.firstTick, me.tickUnit, true);
 				}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chartkick
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-10 00:00:00.000000000 Z
+date: 2016-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler