summaryrefslogtreecommitdiff
path: root/fixtures
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-07-18 15:31:07 +0000
committerRémy Coutable <remy@rymai.me>2016-07-18 15:31:07 +0000
commit08264f4334ff48d1274f066cd5b03455bc4befdf (patch)
tree2a5873d81f4b927f7bdac562906e4c42e6494b1e /fixtures
parenta6e99ab18e5bc3fe34a7e4b29ea28c95630b0c7a (diff)
parentde1fa5010f705927ac5f5c01ce9595d3c52d44ef (diff)
downloadgitlab-ce-08264f4334ff48d1274f066cd5b03455bc4befdf.tar.gz
Merge branch 'undo-revert-of-4892' into 'master' 19396-api-allow-admin-owner-to-set-timestamp-when-changing-issue-state
Revert "Revert "Merge branch '18193-developers-can-merge' into 'master'"" ## What does this MR do? Reverts the revert of !4892 which lacked an EE MR at the time. This has been done in gitlab-org/gitlab-ee!564. ## What are the relevant issue numbers? Closes #19872. See merge request !5310
Diffstat (limited to 'fixtures')
0 files changed, 0 insertions, 0 deletions