diff options
author | Jacob Schatz <jschatz@gitlab.com> | 2016-07-18 18:08:36 +0300 |
---|---|---|
committer | Jacob Schatz <jschatz@gitlab.com> | 2016-07-18 18:08:36 +0300 |
commit | a6e99ab18e5bc3fe34a7e4b29ea28c95630b0c7a (patch) | |
tree | d0e3651c6ef716ddbcd09df8640d0d5be7e46c97 /app | |
parent | 017ae313dc84682e260e960f93fb4a55af0df523 (diff) | |
parent | 70582dbef6c8fe5f72f6ba835fd066a5926f85f8 (diff) |
Merge branch 'master' into 'master'
Fix activity heatmap to show proper day name.
## What does this MR do?
This MR fixes issue #19909.
## Are there points in the code the reviewer needs to double check?
Not necessarily, it's pretty straightforward, buuuut
There was some discussion about whether GL wanted the activity heatmap to start on Monday or Sunday, this fix makes it start on Sunday, if GL is wanting it to start on Monday then some more substantial changes need to be made on the `calendar.js.coffee` script.
## Why was this MR needed?
The amount of day names that were off from their dates was too damn high! :P
## What are the relevant issue numbers?
Directly #19909
Also some related discussion (feature discussion):
#19282, #5988
## Screenshots (if relevant)
**Currently on GL.com**
![Screen_Shot_2016-07-16_at_10.56.02_PM](/uploads/b45cfc56c29a8865a2bdc1f798409706/Screen_Shot_2016-07-16_at_10.56.02_PM.png)
**After MR**
![Screen_Shot_2016-07-16_at_10.56.30_PM](/uploads/d8655bb259ced443a2c572ff03dcb8bb/Screen_Shot_2016-07-16_at_10.56.30_PM.png)
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- Tests
- [x] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
See merge request !5303
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/javascripts/lib/utils/datetime_utility.js.coffee | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/lib/utils/datetime_utility.js.coffee b/app/assets/javascripts/lib/utils/datetime_utility.js.coffee index 178963fe0aa..2371e913844 100644 --- a/app/assets/javascripts/lib/utils/datetime_utility.js.coffee +++ b/app/assets/javascripts/lib/utils/datetime_utility.js.coffee @@ -2,7 +2,7 @@ w.gl ?= {} w.gl.utils ?= {} - w.gl.utils.days = ['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday'] + w.gl.utils.days = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'] w.gl.utils.formatDate = (datetime) -> dateFormat(datetime, 'mmm d, yyyy h:MMtt Z') |