diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-26 18:40:34 +0300 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-26 18:40:34 +0300 |
commit | 7842a815693328614c77f636b3b413d260739fcf (patch) | |
tree | 50a1a7eba3ac8ebf81feeba840e5c731b581d4b9 /app | |
parent | 3302888cec220443a06e23b3f8d29f5080bc86ab (diff) | |
parent | 80fd8f2de19634b62356e27cd0b105fef6787931 (diff) |
Merge branch 'capitalize-js-class' into 'master'
Capitalize js class name
See merge request !457
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/javascripts/calendar.js.coffee | 2 | ||||
-rw-r--r-- | app/views/users/calendar.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/calendar.js.coffee b/app/assets/javascripts/calendar.js.coffee index d08ef9361a6..37b7ba2cc10 100644 --- a/app/assets/javascripts/calendar.js.coffee +++ b/app/assets/javascripts/calendar.js.coffee @@ -1,4 +1,4 @@ -class @calendar +class @Calendar options = month: "short" day: "numeric" diff --git a/app/views/users/calendar.html.haml b/app/views/users/calendar.html.haml index 488f49267c7..922b0c6cebf 100644 --- a/app/views/users/calendar.html.haml +++ b/app/views/users/calendar.html.haml @@ -4,7 +4,7 @@ %small Issues, merge requests and push events #cal-heatmap.calendar :javascript - new calendar( + new Calendar( #{@timestamps.to_json}, #{@starting_year}, #{@starting_month}, |