summaryrefslogtreecommitdiff
path: root/lib/api/api.rb
diff options
context:
space:
mode:
authorJacob Schatz <jschatz@gitlab.com>2016-06-17 16:07:41 +0000
committerJacob Schatz <jschatz@gitlab.com>2016-06-17 16:07:41 +0000
commit7b944e01bddea2ae2ee8e4f68976df9cd8ce63bc (patch)
tree0a51f70bf86f51d8887d2d489391ff7a23f431cb /lib/api/api.rb
parent6c292e90be711392beaba90bfd8c40079da0266b (diff)
parentf1a0e88201e0f9bdfc828858268149b386a625b1 (diff)
downloadgitlab-ce-7b944e01bddea2ae2ee8e4f68976df9cd8ce63bc.tar.gz
Merge branch 'contrib-calendar-colors' into 'master'
Fixed issue with user calendar colors ## What does this MR do? Fixes an issue with the colors added onto the user contrib calendar. The calendar was change recently to remove a library which affected how the colors where generated. ## What are the relevant issue numbers? Closes #18505 ## Screenshots (if relevant) ![Screen_Shot_2016-06-13_at_09.33.10](/uploads/f17451d2eb805e9d75d859cd1691e0bc/Screen_Shot_2016-06-13_at_09.33.10.png) See merge request !4614
Diffstat (limited to 'lib/api/api.rb')
0 files changed, 0 insertions, 0 deletions