summaryrefslogtreecommitdiff
path: root/lib/api/files.rb
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2018-03-07 10:16:39 +0000
committerSean McGivern <sean@mcgivern.me.uk>2018-03-07 10:16:39 +0000
commit5d8d6dbde767d700e08cc913bee7d0c5ffad20b2 (patch)
tree5d450508890c9219f2e8e63a911f677aace80c31 /lib/api/files.rb
parentcfe203fa3a77adbb33f877c98af5e117b1ccd281 (diff)
parente2bdce8defbbd5a11d50115e3d52498d90417ac2 (diff)
downloadgitlab-ce-5d8d6dbde767d700e08cc913bee7d0c5ffad20b2.tar.gz
Merge branch 'include-mr-discussions-calendar-activity' into 'master'
Count discussions on issues and merge requests as contributions for the contributions calendar See merge request gitlab-org/gitlab-ce!17557
Diffstat (limited to 'lib/api/files.rb')
0 files changed, 0 insertions, 0 deletions