summaryrefslogtreecommitdiff
path: root/lib/api
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-03-24 00:11:19 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-03-24 00:11:19 +0000
commit88a15b4e7826047d5303d7cfd7847ee53e5eba15 (patch)
treebb7ff2d7d1fdbe5e979d68536d3c8b5dd85a3b15 /lib/api
parent2bb4ea854228c3c9660d5cb55f59e2cafd1f33ec (diff)
parent70fa9d5629f6a368da5d649450e3e575ca1c252a (diff)
downloadgitlab-ce-88a15b4e7826047d5303d7cfd7847ee53e5eba15.tar.gz
Merge branch 'merge-status-without-timestamps' into 'master'
Don't mark merge request as updated when merge status relative to target branch changes. Addresses https://gitlab.com/gitlab-org/gitlab-ce/issues/1254 and private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2165. See merge request !431
Diffstat (limited to 'lib/api')
0 files changed, 0 insertions, 0 deletions