delta/gitlab/gitlab-ce.git - gitlab.com: gitlab-org/gitlab-ce.git

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'master' into merge-conflicts-editor-2	Sean McGivern	2016-10-17	1	-0/+2
\|\
\| *	Enforce TrailingSemicolon and EmptyLineBetweenBlocks in scss-lint23319-enable-trailingsemicolon-on-scss-lint	Clement Ho	2016-10-14	1	-0/+2
* \|	Replace loading text with spinner	Alfredo Sumaran	2016-10-13	1	-2/+2
* \|	Style for resolve conflicts form	Alfredo Sumaran	2016-10-13	1	-0/+4
* \|	Styles for discard alert	Alfredo Sumaran	2016-10-13	1	-3/+13
* \|	Replace textarea with Ace editor	Alfredo Sumaran	2016-10-13	1	-0/+7
* \|	Implement editor to manually resolve merge conflicts	Alfredo Sumaran	2016-10-13	1	-0/+26
\|/
*	Remove #faf9f9 and #f9f9f9 from color palette; replace with #fafafa	Annabel Dunstone	2016-08-28	1	-1/+1
*	Satisfy scss-lint	Douwe Maan	2016-08-15	1	-4/+4
*	CSS theme improvements for MC UI.	Fatih Acet	2016-08-12	1	-12/+55
*	Prefer lowercase hex values as declared in styling guideline.	Fatih Acet	2016-08-12	1	-39/+39
*	Use mixin to create color schemes.	Fatih Acet	2016-08-12	1	-275/+112
*	Implement color schemes for MC UI.	Fatih Acet	2016-08-12	1	-39/+313
*	Simplify Haml template and Scss files for MC UI.	Fatih Acet	2016-08-12	1	-61/+1
*	Show loading button while Ajax request is in progress.	Fatih Acet	2016-08-12	1	-0/+4
*	Draw side-by-side view only one table.	Fatih Acet	2016-08-12	1	-11/+44
*	Make SCSS lint and RuboCop happy	Sean McGivern	2016-08-12	1	-3/+3
*	Fix specs	Sean McGivern	2016-08-12	1	-12/+12
*	Fixes for merge conflicts UI.	Fatih Acet	2016-08-12	1	-0/+1
*	Implement conflict selection with highlighting.	Fatih Acet	2016-08-12	1	-0/+8
*	Styling for selected/unselected versions.	Fatih Acet	2016-08-12	1	-6/+38
*	Added new UI components for Merge Conflicts UI.	Fatih Acet	2016-08-12	1	-0/+66