summaryrefslogtreecommitdiff
path: root/shared
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2016-09-08 10:51:50 +0000
committerDouwe Maan <douwe@gitlab.com>2016-09-08 10:51:50 +0000
commit55cc8777a995d366ff5114beb235f16093bf57df (patch)
treeecc8efcf226f98ee60a5a5bafe12d47548dcbbe6 /shared
parent7f07b1b6f0aaa52adc1e3ed052d71f712b1a6be2 (diff)
parent084bac8935f6532d28db71fbf14e68d9060337e8 (diff)
downloadgitlab-ce-55cc8777a995d366ff5114beb235f16093bf57df.tar.gz
Merge branch 'ref-update-multiple-commits' into 'master'
Allow updating a branch by multiple commits In https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6130 we made Repository#commit_with_hooks a bit too strict; it only allowed updating a branch by one commit. It turns out there is a feature in GitLab Enterprise Edition where we update by multiple commits. This change makes that possible, adds tests, and renames the method to the more appropriate 'update_branch_with_hooks'. See merge request !6246
Diffstat (limited to 'shared')
0 files changed, 0 insertions, 0 deletions