summaryrefslogtreecommitdiff
path: root/lib/api/files.rb
diff options
context:
space:
mode:
authorSean McGivern <sean@gitlab.com>2017-02-01 14:28:04 +0000
committerSean McGivern <sean@gitlab.com>2017-02-03 09:46:03 +0000
commit7550f60ddeecebac3f84e8690ab3f42428600ff7 (patch)
treef2121574ae7e46a2cc970f92a1287ad1289c4e5b /lib/api/files.rb
parentfd46fb1cd9cc1fdf826d31261aa594baa38d4898 (diff)
downloadgitlab-ce-7550f60ddeecebac3f84e8690ab3f42428600ff7.tar.gz
Backport changes from EE squash
Backport changes from the EE-only squash implementation, which would otherwise conflict when merge CE into EE. <https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1024>
Diffstat (limited to 'lib/api/files.rb')
0 files changed, 0 insertions, 0 deletions