diff options
author | Fatih Acet <acetfatih@gmail.com> | 2016-11-22 21:31:08 +0000 |
---|---|---|
committer | Alejandro RodrÃguez <alejorro70@gmail.com> | 2016-11-24 15:47:48 +0000 |
commit | ca2830f533e07adfedb19acca9b66be8bbe97b48 (patch) | |
tree | dc2144951086dfc1cdd1a68cda9f6f0caff3d4ae /app/assets | |
parent | 65b63d1027737adb1ba4b72e86fe34fede2e07d3 (diff) | |
download | gitlab-ce-ca2830f533e07adfedb19acca9b66be8bbe97b48.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:
![2016-10-25_10.42.20](/uploads/7d442c09cd15082cf69f673a544b56f9/2016-10-25_10.42.20.gif)
After:
![2016-10-25_10.40.35](/uploads/6123365f0ec63ee84658ee6057e7715c/2016-10-25_10.40.35.gif)
## 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')
-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(''); } }; |