app/views/projects/merge_requests · 86cedb082576ceca3522c33c10d367d765e02cf8 · Forest Godfrey / gitlab-ce

Merge remote-tracking branch 'origin/master' into with-pipeline-view · 7c1acb02

authored May 09, 2016

# Conflicts:
#	app/views/projects/ci/builds/_build.html.haml
#	app/views/projects/commit/_ci_commit.html.haml
#	app/views/projects/commit/_commit_box.html.haml

7c1acb02

Name	Last commit	Last update
..
dropdowns		Loading commit data...
show		Loading commit data...
widget		Loading commit data...
_discussion.html.haml		Loading commit data...
_form.html.haml		Loading commit data...
_head.html.haml		Loading commit data...
_header_title.html.haml		Loading commit data...
_merge_request.html.haml		Loading commit data...
_merge_requests.html.haml		Loading commit data...
_new_compare.html.haml		Loading commit data...
_new_submit.html.haml		Loading commit data...
_show.html.haml		Loading commit data...
branch_from.html.haml		Loading commit data...
branch_to.html.haml		Loading commit data...
cancel_merge_when_build_succeeds.js.haml		Loading commit data...
diffs.html.haml		Loading commit data...
edit.html.haml		Loading commit data...
index.html.haml		Loading commit data...
invalid.html.haml		Loading commit data...
merge.js.haml		Loading commit data...
new.html.haml		Loading commit data...
show.html.haml		Loading commit data...
update_branches.html.haml		Loading commit data...