summaryrefslogtreecommitdiff
path: root/lib/gitlab/ci/parsers
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzegorz@gitlab.com>2018-12-11 08:58:46 +0000
committerGrzegorz Bizon <grzegorz@gitlab.com>2018-12-11 08:58:46 +0000
commit85f430cb3cde4ff8c4d24c1b2a426670e38dd44f (patch)
tree7124cdc73f3f98e41fbae527c7df96d620e7cec9 /lib/gitlab/ci/parsers
parent97ba7735eaefa0e749295b722434e1d3826bbbc2 (diff)
parent1bd7f7cb201a246f3376481f7d7ab53f415f843b (diff)
downloadgitlab-ce-85f430cb3cde4ff8c4d24c1b2a426670e38dd44f.tar.gz
Merge branch 'sh-revert-mr-22911' into 'master'
Revert "Merge branch '28682-can-merge-branch-before-build-is-started' into 'master'" See merge request gitlab-org/gitlab-ce!23715
Diffstat (limited to 'lib/gitlab/ci/parsers')
0 files changed, 0 insertions, 0 deletions