summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClement Ho <ClemMakesApps@gmail.com>2018-01-29 10:38:14 -0600
committerClement Ho <ClemMakesApps@gmail.com>2018-01-29 10:38:14 -0600
commitba55dfd6bfb42d8eca74f9805b10e3ac2d84cfe8 (patch)
treeff437dde7487fec93669805fc534a48ec5fc56bc
parent98dd492766e3455d75fcab47a6abfa100d5c859c (diff)
downloadgitlab-ce-cal-label-fix.tar.gz
Contribution calendar label cutoff fixcal-label-fix
-rw-r--r--app/assets/javascripts/users/activity_calendar.js2
-rw-r--r--changelogs/unreleased/contribution_calendar_label_cut_off.yml5
2 files changed, 6 insertions, 1 deletions
diff --git a/app/assets/javascripts/users/activity_calendar.js b/app/assets/javascripts/users/activity_calendar.js
index 0581239d5a5..0ca54faa71c 100644
--- a/app/assets/javascripts/users/activity_calendar.js
+++ b/app/assets/javascripts/users/activity_calendar.js
@@ -98,7 +98,7 @@ export default class ActivityCalendar {
const secondLastColMonth = this.timestampsTmp[group - 2][0].date.getMonth();
if (lastColMonth !== secondLastColMonth) {
- extraWidthPadding = 3;
+ extraWidthPadding = 6;
}
return extraWidthPadding;
diff --git a/changelogs/unreleased/contribution_calendar_label_cut_off.yml b/changelogs/unreleased/contribution_calendar_label_cut_off.yml
new file mode 100644
index 00000000000..0b4a746bab8
--- /dev/null
+++ b/changelogs/unreleased/contribution_calendar_label_cut_off.yml
@@ -0,0 +1,5 @@
+---
+title: Contribution calendar label was cut off
+merge_request:
+author: Branka Martinovic
+type: fixed