diff options
author | Fatih Acet <acetfatih@gmail.com> | 2016-11-22 21:31:08 +0000 |
---|---|---|
committer | Fatih Acet <acetfatih@gmail.com> | 2016-11-22 21:31:08 +0000 |
commit | b6dc727de143459469a400c17dcccdd805f4afb8 (patch) | |
tree | 4c5ab959bccfd2b88800f379aaa497a53f8b014c /app/assets/javascripts/users | |
parent | f7fb61b4f9519c4a564f2db09c0a086479046d66 (diff) | |
parent | 2ad630fb51da9eacfb8716a4615e250efd44e0a7 (diff) | |
download | gitlab-ce-b6dc727de143459469a400c17dcccdd805f4afb8.tar.gz |
Merge branch 'disable-calendar-deselection' into 'master'
Fix deselecting calendar days on contribution graph
## What does this MR do?
Fix deselecting calendar days on contribution graph
## Are there points in the code the reviewer needs to double check?
Shouldn't be
## Why was this MR needed?
In `master`, you can currently deselect a calendar day after selecting but you cannot reselect that day.
## Screenshots (if relevant)
Before:

After:

## 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 [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [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)
## What are the relevant issue numbers?
Closes #22381
See merge request !6453
Diffstat (limited to 'app/assets/javascripts/users')
-rw-r--r-- | app/assets/javascripts/users/calendar.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/assets/javascripts/users/calendar.js b/app/assets/javascripts/users/calendar.js index 6d739039a5b..ba7f533c349 100644 --- a/app/assets/javascripts/users/calendar.js +++ b/app/assets/javascripts/users/calendar.js @@ -206,6 +206,7 @@ } }); } else { + this.currentSelectedDate = ''; return $('.user-calendar-activities').html(''); } }; |