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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Document better the CE -> EE mergedocument-ce-to-ee	Rémy Coutable	2017-02-16	2	-17/+26
\| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
*	Merge branch '27281-devicon' into 'master'	Robert Speicher	2017-02-16	4	-1/+17
\|\ \| \| \| \| \| \| \| \|	override favicon for development to find tabs more easily See merge request !9260
\| *	dev favicon is blue, not purple27281-devicon	Simon Knox	2017-02-16	3	-3/+3
\| \|
\| *	override favicon for development to find tabs more easily	Simon Knox	2017-02-16	4	-1/+17
\| \|
* \|	Merge branch 'sh-namespace-cleanup-deleted-projects' into 'master'	Douwe Maan	2017-02-16	4	-6/+31
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fix a number of race conditions that can occur during namespace deletion See merge request !9294
\| * \|	Fix a number of race conditions that can occur during namespace deletionsh-namespace-cleanup-deleted-projects	Stan Hu	2017-02-15	4	-6/+31
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	There are two problems in the current implementation: 1. If a project is marked for deletion via the `pending_delete` flag and then the namespace was quickly deleted, it's possible that the namespace skips over that project and leaves that project in an orphaned state. 2. Before namespace deletion, the namespace attempts to clean up all the relevant storage paths. However, if all projects have been removed synchronously, then the namespace will not be able to clean anything. To prevent this, we should load the paths to be deleted before actually destroying projects. The specs were missing this second case due to a permission issue that caused project removal never to happen.
* \| \|	Merge branch '26957-tanuki-anim-hang' into 'master'	Clement Ho	2017-02-16	6	-6/+26
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	don't trigger tanuki loader when downloading files See merge request !9290
\| * \| \|	don't trigger tanuki loader when downloading files26957-tanuki-anim-hang	Simon Knox	2017-02-16	6	-6/+26
\| \| \| \|
* \| \| \|	Merge branch '27986-text-spacing' into 'master'	Filipa Lacerda	2017-02-16	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add space between ci text and commit sha in Merge Request widget Closes #27986 See merge request !9308
\| * \| \| \|	add space between ci text and commit sha in Merge Request widget27986-text-spacing	Simon Knox	2017-02-17	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	flex parent was pushing elements together
* \| \| \| \|	Merge branch 'fix/import-hooks' into 'master'	Rémy Coutable	2017-02-16	5	-32/+49
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix import webhooks performance issue Closes #27958 See merge request !9197
\| * \| \| \| \|	fix tmpdirfix/import-hooks	James Lopez	2017-02-16	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Use gitlab shell import instead of manually creating the webhooks	James Lopez	2017-02-16	5	-32/+49
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also update repo restorer to use project wiki method.
* \| \| \| \| \|	Merge branch 'paginate-environments-bundle' into 'master'	Fatih Acet	2017-02-16	41	-1378/+1884
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Paginate environments bundle Closes #25499 See merge request !9302
\| * \ \ \ \ \	Merge branch 'fe-paginated-environments-api' into ↵paginate-environments-bundle	Filipa Lacerda	2017-02-16	41	-1378/+1884
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'paginate-environments-bundle' Integrate with new environments API See merge request !8954
\| \| * \ \ \ \ \	Merge branch 'fe-paginated-environments-api-add-pagination' into ↵	Filipa Lacerda	2017-02-16	23	-255/+1006
\| \| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'fe-paginated-environments-api' Add pagination to environments table See merge request !9090
\| \| \| * \ \ \ \ \	Merge branch 'fe-paginated-environments-api-add-subview' into ↵	Filipa Lacerda	2017-02-16	19	-257/+851
\| \| \| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'fe-paginated-environments-api-add-pagination' Adds sub view to list environments under a folder See merge request !9169
\| \| \| \| * \| \| \| \| \|	Remove arrow icon from folders	Filipa Lacerda	2017-02-16	1	-1/+0
\| \| \| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \| \| \|	Create util to handle pagination transformation	Filipa Lacerda	2017-02-16	4	-18/+41
\| \| \| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \| \| \|	Changes after review	Filipa Lacerda	2017-02-16	3	-13/+14
\| \| \| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \| \| \|	Merge branch 'fe-paginated-environments-api-add-pagination' into ↵	Filipa Lacerda	2017-02-16	4	-5/+13
\| \| \| \| \|\ \ \ \ \ \ \| \| \| \| \|/ / / / / / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fe-paginated-environments-api-add-subview * fe-paginated-environments-api-add-pagination: Changes after review Rename storePagination to setPagination
\| \| \| * \| \| \| \| \| \|	Changes after reviewfe-paginated-environments-api-add-pagination	Filipa Lacerda	2017-02-16	1	-2/+10
\| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \|	Rename storePagination to setPagination	Filipa Lacerda	2017-02-16	3	-3/+3
\| \| \| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \| \| \|	Fix broken testsfe-paginated-environments-api-add-subview	Filipa Lacerda	2017-02-16	5	-77/+98
\| \| \| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \| \| \|	Adds Changelog entry	Filipa Lacerda	2017-02-15	1	-0/+4
\| \| \| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \| \| \|	Moves check for latest key to store instead of poluting the view making it ↵	Filipa Lacerda	2017-02-15	3	-100/+112
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	reusable between endpoints.
\| \| \| \| * \| \| \| \| \|	Move change page param to utility function	Filipa Lacerda	2017-02-15	9	-72/+328
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add tests Adds folder name in the top of the table
\| \| \| \| * \| \| \| \| \|	Use common util to get parameter name	Filipa Lacerda	2017-02-15	2	-22/+9
\| \| \| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \| \| \|	Fix underline style	Filipa Lacerda	2017-02-15	1	-0/+1
\| \| \| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \| \| \|	Adds url for folder;	Filipa Lacerda	2017-02-15	5	-96/+59
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Creates new subview to show envirnoments that belong to a folder
\| \| \| \| * \| \| \| \| \|	First iteration	Filipa Lacerda	2017-02-15	5	-0/+268
\| \| \| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \| \| \|	Extracts table into a reusable component	Filipa Lacerda	2017-02-15	5	-26/+85
\| \| \| \|/ / / / / /
\| \| \| * \| \| \| \| \|	Merge branch 'fe-paginated-environments-api' into ↵	Filipa Lacerda	2017-02-15	1	-3/+4
\| \| \| \|\ \ \ \ \ \ \| \| \| \|/ / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fe-paginated-environments-api-add-pagination * fe-paginated-environments-api: Add count keys to response JSON
\| \| * \| \| \| \| \| \|	Add count keys to response JSONfe-paginated-environments-api	Z.J. van de Weg	2017-02-15	1	-3/+4
\| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \|	Add pagination tests for environments table	Filipa Lacerda	2017-02-12	3	-27/+62
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove fdescribe statement Fix conflict
\| \| \| * \| \| \| \| \|	Remove spec checking for scope 'all' since it's no longer part of component	Filipa Lacerda	2017-02-12	3	-11/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changes after review Fix typo
\| \| \| * \| \| \| \| \|	Integrates pagination component with API	Filipa Lacerda	2017-02-12	7	-34/+100
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds pagination tests Remove misplaced comment Fix broken store test
\| \| \| * \| \| \| \| \|	Verify `latest` key is present when needed	Filipa Lacerda	2017-02-12	1	-0/+12
\| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \|	Adds pagination component	Filipa Lacerda	2017-02-12	2	-2/+36
\| \| \|/ / / / / /
\| \| * \| \| \| \| \|	Fix typo	Filipa Lacerda	2017-02-12	2	-13/+13
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Fix broken path	Filipa Lacerda	2017-02-12	1	-25/+83
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Merge branch 'master' into fe-paginated-environments-api	Filipa Lacerda	2017-02-12	183	-9908/+1061
\| \| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (97 commits) convert js-cookie dependency to an npm module convert timeago.js dependency to an npm module remove vue from vendor since it is now in node_modules Add CHANGELOG file Stylize blockquote in notification emails Add js prefix to right sidebar Replace accidentally deleted metaclick Remove right padding from navbar-collapse on large screens Add changelog common_utils merge conflicts Set sidebar height to 100% if at top of page Set height of fixed sidebars with js Add sticky sidebar on wiki page Fix comment button test for slash commands Fix time tracking spec Fix issue boards sidebar alignment and sidebar toggle spec Fix failing conflicts test Fix build sidebar scrolling Refactor JS Fix pinned sidebar alignment ...
\| \| * \| \| \| \| \| \|	Fix pagination headers in grouped environments API	Grzegorz Bizon	2017-02-10	2	-9/+25
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Fix broken test and linter error	Filipa Lacerda	2017-02-09	2	-2/+2
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Add route for environment folder and expose an API	Grzegorz Bizon	2017-02-09	2	-0/+22
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Use CJS in all environments components	Filipa Lacerda	2017-02-09	16	-817/+782
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Use CJS in environments service	Filipa Lacerda	2017-02-09	2	-19/+7
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Use CJS for tests.	Filipa Lacerda	2017-02-09	5	-36/+36
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updates expected model in tests
\| \| * \| \| \| \| \| \|	Remove store from global namespace, use CSJ instead	Filipa Lacerda	2017-02-09	4	-76/+65
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Resolve 500 error	Filipa Lacerda	2017-02-09	2	-2/+1
\| \| \| \| \| \| \| \| \|