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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'master' into mc-ui	Douwe Maan	2016-08-15	13	-76/+303
\|\
\| *	Add small corrections to test coverage report badge	Grzegorz Bizon	2016-08-15	1	-2/+2
\| *	Add metadata and template methods for coverage badge	Grzegorz Bizon	2016-08-15	1	-0/+8
\| *	Extract base abstract template for badges	Grzegorz Bizon	2016-08-15	3	-35/+51
\| *	Add template class for coverage report badge	Grzegorz Bizon	2016-08-15	1	-0/+69
\| *	Extract the abstract base class of badge metadata	Grzegorz Bizon	2016-08-15	3	-22/+42
\| *	Add coverage report badge metadata class	Grzegorz Bizon	2016-08-15	1	-0/+38
\| *	Implement the main class of test coverage badge	Grzegorz Bizon	2016-08-15	1	-1/+30
\| *	Refactor badge template and metadata classes	Grzegorz Bizon	2016-08-15	4	-14/+19
\| *	Move badges to separate modules and add base class	Grzegorz Bizon	2016-08-15	7	-49/+74
\| *	Add empty test coverage badge class and specs	Grzegorz Bizon	2016-08-15	1	-0/+17
\| *	Merge branch '20842-todos-queries-cache' into 'master'	Yorick Peterse	2016-08-15	1	-5/+3
\| \|\
\| \| *	Recover usage of Todos counter cache20842-todos-queries-cache	Paco Guzman	2016-08-12	1	-4/+2
\| \| *	Use cache for todos counter calling TodoService	Paco Guzman	2016-08-12	1	-1/+1
\| * \|	Merge branch 'change-access-update' into 'master'	Yorick Peterse	2016-08-15	1	-1/+1
\| \|\ \
\| \| * \|	Change the order of the access rules to check simpler first, and add specschange-access-update	Alejandro Rodríguez	2016-08-12	1	-1/+1
\| \| \|/
\| * \|	Fix a memory leak caused by Banzai::Filter::SanitizationFilterfix/sanitization-filter-leak	Ahmad Sherif	2016-08-14	1	-1/+3
\| \|/
* \|	Fix bug where conflict view would have one too many context sections	Douwe Maan	2016-08-12	1	-2/+4
* \|	Find match line headers by backtracking	Sean McGivern	2016-08-12	1	-11/+24
* \|	Add more tests for conflicts	Sean McGivern	2016-08-12	1	-1/+1
* \|	Move resolving code to ResolveService	Sean McGivern	2016-08-12	2	-29/+0
* \|	Clarify Conflict::File#sections method	Sean McGivern	2016-08-12	1	-3/+19
* \|	Don't allow resolving invalid conflicts	Sean McGivern	2016-08-12	1	-2/+2
* \|	Add blob_icon to conflict file JSON	Sean McGivern	2016-08-12	1	-2/+4
* \|	Add blob_path to conflict file JSON	Sean McGivern	2016-08-12	2	-4/+10
* \|	Use same resolution format on FE and BE	Sean McGivern	2016-08-12	2	-4/+5
* \|	Fix specs	Sean McGivern	2016-08-12	4	-18/+13
* \|	Fix match line headers at start / end of file	Sean McGivern	2016-08-12	1	-16/+33
* \|	Handle case where one side deleted the file	Sean McGivern	2016-08-12	1	-3/+5
* \|	Highlight files based on merged file	Sean McGivern	2016-08-12	1	-2/+5
* \|	Remove unneeded raise	Sean McGivern	2016-08-12	1	-3/+0
* \|	Add match line headers	Sean McGivern	2016-08-12	1	-1/+8
* \|	Raise errors for large and binary files	Sean McGivern	2016-08-12	1	-1/+5
* \|	Handle conflict resolution errors in controller	Sean McGivern	2016-08-12	2	-7/+10
* \|	Fix MR conflict resolution commits	Sean McGivern	2016-08-12	1	-1/+1
* \|	Auto-highlight conflict when rich_text is called	Sean McGivern	2016-08-12	3	-13/+17
* \|	Fix merge conflict reading for new diffs	Sean McGivern	2016-08-12	1	-1/+1
* \|	Allow resolving conflicts in MR controller	Sean McGivern	2016-08-12	2	-1/+63
* \|	Handle multiple merge conflict files in collection	Sean McGivern	2016-08-12	3	-14/+71
* \|	Add backend for merge conflicts reading	Sean McGivern	2016-08-12	3	-0/+161
\|/
*	api for generating new merge request	Scott Le	2016-08-11	5	-23/+52
*	Merge branch 'remove-grack-lfs' into 'master'	Rémy Coutable	2016-08-11	3	-590/+0
\|\
\| *	Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into remove-...	Jacob Vosmaer	2016-08-09	98	-786/+1746
\| \|\
\| * \|	Remove obsolete code	Jacob Vosmaer	2016-07-22	3	-590/+0
* \| \|	Merge branch 'refactor-builds-creation-service' into 'master'	Rémy Coutable	2016-08-11	1	-1/+1
\|\ \ \
\| * \| \|	Pre-create all builds for Pipeline when a trigger is received	Kamil Trzcinski	2016-08-11	1	-1/+1
* \| \| \|	Merge branch '10772-fix-urlencoded-branchname' into 'master'	Rémy Coutable	2016-08-11	1	-1/+1
\|\ \ \ \
\| * \| \| \|	Fix front-end for branches that happen to contain urlencoding escape characte...10772-fix-urlencoded-branchname	Elliot	2016-08-11	1	-1/+1
\| \|/ / /
* \| \| \|	Merge branch 'file_exists_deprecated' into 'master'	Rémy Coutable	2016-08-11	6	-18/+18
\|\ \ \ \
\| * \| \| \|	Use `File::exist?` instead of `File::exists?`	bogdanvlviv	2016-08-11	6	-18/+18
\| \|/ / /