9e9ce95d62
Conflicts: app/views/dashboard/_project.html.haml app/views/events/event/_common.html.haml app/views/explore/projects/_project.html.haml app/views/groups/_projects.html.haml app/views/projects/_home_panel.html.haml app/views/projects/_issues_nav.html.haml app/views/projects/issues/_discussion.html.haml app/views/projects/issues/_issues.html.haml app/views/projects/issues/show.html.haml app/views/projects/merge_requests/_discussion.html.haml app/views/projects/merge_requests/_show.html.haml app/views/projects/milestones/index.html.haml app/views/projects/notes/_edit_form.html.haml app/views/shared/_issuable_filter.html.haml |
||
|---|---|---|
| .. | ||
| show | ||
| _discussion.html.haml | ||
| _form.html.haml | ||
| _head.html.haml | ||
| _merge_request.html.haml | ||
| _new_compare.html.haml | ||
| _new_submit.html.haml | ||
| _show.html.haml | ||
| automerge.js.haml | ||
| branch_from.js.haml | ||
| branch_to.js.haml | ||
| diffs.html.haml | ||
| edit.html.haml | ||
| index.html.haml | ||
| invalid.html.haml | ||
| new.html.haml | ||
| show.html.haml | ||
| update.js.haml | ||
| update_branches.js.haml | ||