15 commits

Author	SHA1	Message	Date
Douwe Maan	4d7c201414	Don’t hardcode paths	2016-08-12 23:24:50 +03:00
Douwe Maan	5e1e08e5ce	Show appropriate message when conflicts have already been resolved	2016-08-12 23:24:50 +03:00
Fatih Acet	bdbff15298	Separate inline haml vue templates into new files.	2016-08-12 23:24:49 +03:00
Fatih Acet	709c308e0e	Simplify Haml template and Scss files for MC UI.	2016-08-12 23:24:49 +03:00
Fatih Acet	f9e0a6dade	Dynamically highlight code blocks in merge conflicts widgets.	2016-08-12 23:24:49 +03:00
Fatih Acet	0039fcd3ff	Update button titles in merge conflicts widget header.	2016-08-12 23:24:49 +03:00
Fatih Acet	41f7cee991	Show loading button while Ajax request is in progress.	2016-08-12 23:24:49 +03:00
Fatih Acet	5277239c3e	Prefer v-show instead of v-if.	2016-08-12 23:24:48 +03:00
Fatih Acet	912cc7b862	Add file icon and blob link.	2016-08-12 23:24:47 +03:00
Fatih Acet	ad0b5ffbb5	Draw side-by-side view only one table.	2016-08-12 23:24:47 +03:00
Fatih Acet	16b13cbc2c	Put file blob link as href.	2016-08-12 23:24:47 +03:00
Fatih Acet	e47e537b07	Handle renamed files in file header.	2016-08-12 23:24:47 +03:00
Fatih Acet	29bed9967b	Add v-cloak to parent Vue element for MCUI.	2016-08-12 23:24:47 +03:00
Fatih Acet	8b6a075e6f	Implement commit in merge conflicts UI.	2016-08-12 23:24:46 +03:00
Fatih Acet	c2295fbdf8	Render right sidebar and handle request error.	2016-08-12 23:24:46 +03:00

Renamed from app/views/projects/merge_requests/conflicts.haml (Browse further)