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

	Commit message (Collapse)	Author	Age	Files	Lines
*	changed minor inconsistency in help textzero-for-unlimited	dimitrieh	2017-02-17	1	-2/+2
\|
*	Merge branch '28248-use-page' into 'master'	Robert Speicher	2017-02-17	1	-3/+2
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Use `page` query parameter instead of `p` to keep consistency with all URLs Closes #28248 See merge request !9268
\| *	Reduce number of pipelines created to test pagination28248-use-page	Filipa Lacerda	2017-02-16	1	-1/+1
\| \| \| \| \| \| \| \|	stub pagination in tests
\| *	Merge branch 'master' into 28248-use-page	Filipa Lacerda	2017-02-16	18	-58/+67
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: Renders pagination again for pipelines table Simplify Pages admin source docs Simplify Pages admin Omnibus docs Seed abuse reports Add active_when helper
\| * \	Merge branch 'master' into 28248-use-page	Filipa Lacerda	2017-02-16	46	-1199/+1418
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (65 commits) Add CHANGELOG file Fix positioning of top scroll button add space between ci text and commit sha in Merge Request widget Do not use single quote in headings as it breaks docs.gitlab.com Fix broken test Update services templates docs Fix error in MR widget after /merge slash command Remove arrow icon from folders Create util to handle pagination transformation Wrap long Project and Group titles Changes after review Changes after review Rename storePagination to setPagination Transforms startTimeAgoLoops into a static method so we can reuse it instead of have 2 Only run timeago loops after rendering timeago components fix tmpdir Fix broken tests Show merge errors in merge request widget Move babel config for instanbul to karma config (!9286) Clarify that stage is needed to stop environments ...
\| * \ \	Merge branch 'master' into 28248-use-page	Filipa Lacerda	2017-02-15	1	-1/+0
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: Fix most of broken docs links Change wording of MR comment box
\| * \| \| \|	Use `page` query parameter instead of `p` to keep consistency with all URLs	Filipa Lacerda	2017-02-15	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix rubocop error
* \| \| \| \|	Merge branch '28059-add-pagination-to-admin-abuse-reports' into 'master'	Alfredo Sumaran	2017-02-16	1	-0/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Restore pagination to admin abuse reports Closes #28059 See merge request !9233
\| * \| \| \| \|	Restore pagination to admin abuse reports	Eric Eastwood	2017-02-16	1	-0/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'add-issues-button-disable' into 'master'	Fatih Acet	2017-02-16	1	-1/+1
\|\ \ \ \ \ \ \| \|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Disables add issue button Closes #27931 See merge request !9100
\| * \| \| \| \|	Disables add issue buttonadd-issues-button-disable	Phil Hughes	2017-02-09	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Previously was disabled until any list was present (except for done) this now takes into account the welcome blank state Closes #27931
* \| \| \| \| \|	Merge branch 'fix-pipelines-pagination-is-gone' into 'master'	Alfredo Sumaran	2017-02-16	2	-2/+5
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Renders pagination again for pipelines table Closes #28299 See merge request !9315
\| * \| \| \| \| \|	Renders pagination again for pipelines table	Filipa Lacerda	2017-02-16	2	-2/+5
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'active_when' into 'master'	Robert Speicher	2017-02-16	16	-55/+61
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add active_when helper Closes #24036 See merge request !9166
\| * \| \| \| \|	Add active_when helper	Semyon Pupkov	2017-02-15	16	-55/+61
\| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/24036
* \| \| \| \|	Merge branch '28262-horizontal-scrolling-issue-on-long-project-names' into ↵	Annabel Dunstone Gray	2017-02-16	1	-0/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Resolve "Horizontal scrolling issue on long project names" Closes #28262 See merge request !9301
\| * \| \| \| \|	Wrap long Project and Group titles28262-horizontal-scrolling-issue-on-long-project-names	Sam Rose	2017-02-16	1	-0/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '28247-timeloops-bug' into 'master'	Clement Ho	2017-02-16	4	-50/+33
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Only run timeago loops after rendering timeago components Closes #28247 See merge request !9267
\| * \| \| \| \| \|	Transforms startTimeAgoLoops into a static method so we can reuse it instead ↵	Filipa Lacerda	2017-02-16	3	-9/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	of have 2 Fix broken test
\| * \| \| \| \| \|	Only run timeago loops after rendering timeago components	Filipa Lacerda	2017-02-16	4	-43/+30
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '28253-fix-buid-scroll-button-position' into 'master'	Annabel Dunstone Gray	2017-02-16	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix positioning of top scroll button Closes #28253 See merge request !9276
\| * \| \| \| \| \| \|	Fix positioning of top scroll button	Alfredo Sumaran	2017-02-16	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '27281-devicon' into 'master'	Robert Speicher	2017-02-16	3	-1/+5
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	override favicon for development to find tabs more easily	Simon Knox	2017-02-16	3	-1/+5
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'sh-namespace-cleanup-deleted-projects' into 'master'	Douwe Maan	2017-02-16	3	-3/+15
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	3	-3/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	3	-6/+7
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	3	-6/+7
\| \|/ / / / / / / /
* \| \| \| \| \| \| \| \|	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	1	-0/+4
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix import webhooks performance issue Closes #27958 See merge request !9197
\| * \| \| \| \| \| \| \| \|	Use gitlab shell import instead of manually creating the webhooks	James Lopez	2017-02-16	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also update repo restorer to use project wiki method.
* \| \| \| \| \| \| \| \| \|	Merge branch 'paginate-environments-bundle' into 'master'	Fatih Acet	2017-02-16	22	-1112/+1326
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Paginate environments bundle Closes #25499 See merge request !9302
\| * \ \ \ \ \ \ \ \ \	Merge branch 'fe-paginated-environments-api' into ↵paginate-environments-bundle	Filipa Lacerda	2017-02-16	22	-1112/+1326
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'paginate-environments-bundle' Integrate with new environments API See merge request !8954
\| \| * \| \| \| \| \| \| \| \| \|	Remove arrow icon from folders	Filipa Lacerda	2017-02-16	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Create util to handle pagination transformation	Filipa Lacerda	2017-02-16	3	-18/+17
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	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	3	-4/+12
\| \| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \|	Fix broken testsfe-paginated-environments-api-add-subview	Filipa Lacerda	2017-02-16	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \|	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	6	-72/+79
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	4	-0/+267
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \|	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