summaryrefslogtreecommitdiff
path: root/lib/api/projects.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-03-18 03:39:51 -0700
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-03-18 03:39:51 -0700
commit351390239673923d71610ba320b2bf163ab6f9a9 (patch)
tree9d03e0e566c6a67e9dcf44a172d72cfeccb92024 /lib/api/projects.rb
parentd8ad01bb6e18a150d53a4b4d2767cb0e0ca675a0 (diff)
parent77295b00b8833bebdaa4e846337fa78101573095 (diff)
downloadgitlab-ce-351390239673923d71610ba320b2bf163ab6f9a9.tar.gz
Merge pull request #3242 from murank/fix_failure_of_checking_merge_requests
Fix failure of cheking a merge request after conflict.
Diffstat (limited to 'lib/api/projects.rb')
0 files changed, 0 insertions, 0 deletions