summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dzaporozhets@gitlab.com>2015-02-20 17:01:43 +0000
committerDmitriy Zaporozhets <dzaporozhets@gitlab.com>2015-02-20 17:01:43 +0000
commitbba0b9f9300bcbfd844d04f1a3732f3048da206f (patch)
treebf83a08d6999910b762879b49541d9f3e474db60
parent6b0199ffc1c8e6a79b68a510052a1d1713afc29d (diff)
parente0edea4ae949a006c051768d073737436ba50b2b (diff)
downloadgitlab-ce-bba0b9f9300bcbfd844d04f1a3732f3048da206f.tar.gz
Merge branch 'commits-calendar-height' into 'master'
Fix commits calendar vertical days. Fixes #2031. Before: ![Screen Shot 2015-02-20 at 14.36.31](https://dev.gitlab.org/uploads/gitlab/gitlabhq/08d322797b/Screen_Shot_2015-02-20_at_14.36.31.png) After: ![Screen Shot 2015-02-20 at 14.35.54](https://dev.gitlab.org/uploads/gitlab/gitlabhq/0cfbabad26/Screen_Shot_2015-02-20_at_14.35.54.png) See merge request !1555
-rw-r--r--app/assets/javascripts/calendar.js.coffee3
1 files changed, 0 insertions, 3 deletions
diff --git a/app/assets/javascripts/calendar.js.coffee b/app/assets/javascripts/calendar.js.coffee
index 70940e13858..19ea4ccc4cf 100644
--- a/app/assets/javascripts/calendar.js.coffee
+++ b/app/assets/javascripts/calendar.js.coffee
@@ -16,11 +16,8 @@ class @calendar
subDomain: "day"
range: 12
tooltip: true
- domainDynamicDimension: false
- colLimit: 4
label:
position: "top"
- domainMargin: 1
legend: [
0
1