summaryrefslogtreecommitdiff
path: root/lib/api/variables.rb
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2018-02-01 20:22:04 +0000
committerDouwe Maan <douwe@gitlab.com>2018-02-01 20:22:04 +0000
commit26debb120e6375175b1ffd83343b9974d8c6d060 (patch)
tree35a18214d3d1e916ed6dc2b2266338526f2ca726 /lib/api/variables.rb
parentfd46d6ceb81eb9039b4e60c1d158848dd22ba411 (diff)
parentcf644fc1ff9890189ad2945fc38c7e6b9943cae3 (diff)
downloadgitlab-ce-26debb120e6375175b1ffd83343b9974d8c6d060.tar.gz
Merge branch 'master' into 'zj-ref-contains'zj-ref-contains
# Conflicts: # lib/gitlab/git/repository.rb
Diffstat (limited to 'lib/api/variables.rb')
0 files changed, 0 insertions, 0 deletions