summaryrefslogtreecommitdiff
path: root/app/models/commit.rb
diff options
context:
space:
mode:
authortwonegatives <whitewhiteheaven@gmail.com>2016-12-14 17:37:31 +0300
committertwonegatives <whitewhiteheaven@gmail.com>2017-01-14 12:22:30 +0300
commit85e0b99471b58078e1e50494ae26eb13430d3a9f (patch)
treedf3d2fdb18a1b315cf77fdd9536bd99046d5313a /app/models/commit.rb
parentf14228f0f2f69a967c483e4aa4ef1568e5fdc49b (diff)
downloadgitlab-ce-85e0b99471b58078e1e50494ae26eb13430d3a9f.tar.gz
Notify the user who set auto-merge when merge conflict occurs
Diffstat (limited to 'app/models/commit.rb')
0 files changed, 0 insertions, 0 deletions