08994f3f60
Conflicts: app/assets/javascripts/merge_requests.js db/schema.rb |
||
---|---|---|
.. | ||
_commits.html.haml | ||
_diffs.html.haml | ||
_form.html.haml | ||
_head.html.haml | ||
_how_to_merge.html.haml | ||
_merge_request.html.haml | ||
automerge.js.haml | ||
branch_from.js.haml | ||
branch_to.js.haml | ||
commits.js.haml | ||
diffs.js.haml | ||
edit.html.haml | ||
index.html.haml | ||
new.html.haml | ||
show.html.haml |