summaryrefslogtreecommitdiff
path: root/lib/api/helpers.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dzaporozhets@gitlab.com>2015-03-07 00:13:10 +0000
committerDmitriy Zaporozhets <dzaporozhets@gitlab.com>2015-03-07 00:13:10 +0000
commit7dadd423d5279a67cad6d7919370432931deee3e (patch)
tree64fc48cdd5a1350d22b5a9c68c2a904c7b3cd5c4 /lib/api/helpers.rb
parent0625d68f7510a2f2203bfe2c57f5927a0121c561 (diff)
parent84ebc22ad2d9296d23b442948dd3435b33d36cbe (diff)
downloadgitlab-ce-7dadd423d5279a67cad6d7919370432931deee3e.tar.gz
Merge branch 'condensed-mr-commits' into 'master'
Condense commits already in target branch when updating merge request source branch. Resolves https://dev.gitlab.org/gitlab/gitlabhq/issues/2043. ![Screen_Shot_2015-03-06_at_17.17.13](https://dev.gitlab.org/gitlab/gitlabhq/uploads/8d03540b7b7294ce07005e6f3db6ed3d/Screen_Shot_2015-03-06_at_17.17.13.png) (Not shown in screenshot, but works fine with rebases as well) See merge request !1648
Diffstat (limited to 'lib/api/helpers.rb')
0 files changed, 0 insertions, 0 deletions