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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Reduced sidebar wait timeoutboards-sidebar-spec-refactor	Phil Hughes	2017-02-17	1	-1/+1
\|
*	Refactor boards sidebar spec	Phil Hughes	2017-02-17	1	-86/+53
\| \| \| \| \| \| \| \|	- Uses Timecop to fix due date spec - Waits for sidebar to be visible before doing anything - Fixes weird issues where the link would be clicked instead of the card itself Closes #28310
*	Merge branch '28248-use-page' into 'master'	Robert Speicher	2017-02-17	1	-0/+21
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	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	-6/+5
\| \| \| \| \| \| \| \|	stub pagination in tests
\| *	Merge branch 'master' into 28248-use-page	Filipa Lacerda	2017-02-16	1	-0/+5
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 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	28	-283/+702
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 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	-2/+2
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 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	-0/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix rubocop error
* \| \| \| \|	Merge branch '28059-add-pagination-to-admin-abuse-reports' into 'master'	Alfredo Sumaran	2017-02-16	1	-0/+19
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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/+19
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'fix/project-tree-restorer-spec-performance' into 'master'	Robert Speicher	2017-02-16	2	-95/+122
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Speed up project_tree_restorer_spec Closes #28235 See merge request !9266
\| * \| \| \| \| \|	refactored a couple of thingsfix/project-tree-restorer-spec-performance	James Lopez	2017-02-16	1	-12/+9
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	create lighter version of JSON and reuse initial restore in spec to speed up run	James Lopez	2017-02-15	2	-91/+121
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'add-issues-button-disable' into 'master'	Fatih Acet	2017-02-16	1	-0/+6
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Disables add issue button Closes #27931 See merge request !9100
\| * \| \| \| \| \|	Disables add issue buttonadd-issues-button-disable	Phil Hughes	2017-02-09	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Previously was disabled until any list was present (except for done) this now takes into account the welcome blank state Closes #27931
* \| \| \| \| \| \|	Merge branch 'active_when' into 'master'	Robert Speicher	2017-02-16	1	-0/+5
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add active_when helper Closes #24036 See merge request !9166
\| * \| \| \| \| \|	Add active_when helper	Semyon Pupkov	2017-02-15	1	-0/+5
\| \| \|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/24036
* \| \| \| \| \|	Merge branch '28247-timeloops-bug' into 'master'	Clement Ho	2017-02-16	1	-2/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Only run timeago loops after rendering timeago components Closes #28247 See merge request !9267
\| * \| \| \| \| \|	Fix broken test28247-timeloops-bug	Filipa Lacerda	2017-02-16	1	-2/+2
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '27281-devicon' into 'master'	Robert Speicher	2017-02-16	1	-0/+12
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-2/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	override favicon for development to find tabs more easily	Simon Knox	2017-02-16	1	-0/+12
\| \| \|_\|_\|/ / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'sh-namespace-cleanup-deleted-projects' into 'master'	Douwe Maan	2017-02-16	1	-3/+16
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-3/+16
\| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-0/+15
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-0/+15
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge branch 'fix/import-hooks' into 'master'	Rémy Coutable	2017-02-16	1	-0/+40
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-0/+40
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also update repo restorer to use project wiki method.
* \| \| \| \| \| \| \|	Merge branch 'paginate-environments-bundle' into 'master'	Fatih Acet	2017-02-16	16	-266/+549
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Paginate environments bundle Closes #25499 See merge request !9302
\| * \ \ \ \ \ \ \	Merge branch 'fe-paginated-environments-api' into ↵paginate-environments-bundle	Filipa Lacerda	2017-02-16	16	-266/+549
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'paginate-environments-bundle' Integrate with new environments API See merge request !8954
\| \| * \| \| \| \| \| \| \|	Create util to handle pagination transformation	Filipa Lacerda	2017-02-16	1	-0/+24
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Merge branch 'fe-paginated-environments-api-add-pagination' into ↵	Filipa Lacerda	2017-02-16	1	-1/+1
\| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fe-paginated-environments-api-add-subview * fe-paginated-environments-api-add-pagination: Changes after review Rename storePagination to setPagination
\| \| \| * \| \| \| \| \| \| \|	Rename storePagination to setPagination	Filipa Lacerda	2017-02-16	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Fix broken testsfe-paginated-environments-api-add-subview	Filipa Lacerda	2017-02-16	4	-75/+96
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Move change page param to utility function	Filipa Lacerda	2017-02-15	3	-0/+249
\| \| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add tests Adds folder name in the top of the table
\| \| * \| \| \| \| \| \| \|	Add pagination tests for environments table	Filipa Lacerda	2017-02-12	1	-0/+42
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove fdescribe statement Fix conflict
\| \| * \| \| \| \| \| \| \|	Remove spec checking for scope 'all' since it's no longer part of component	Filipa Lacerda	2017-02-12	2	-9/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changes after review Fix typo
\| \| * \| \| \| \| \| \| \|	Integrates pagination component with API	Filipa Lacerda	2017-02-12	2	-11/+53
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds pagination tests Remove misplaced comment Fix broken store test
\| \| * \| \| \| \| \| \| \|	Fix typo	Filipa Lacerda	2017-02-12	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Merge branch 'master' into fe-paginated-environments-api	Filipa Lacerda	2017-02-12	29	-92/+317
\| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 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	1	-0/+11
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Fix broken test and linter error	Filipa Lacerda	2017-02-09	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Use CJS in all environments components	Filipa Lacerda	2017-02-09	6	-21/+20
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Use CJS for tests.	Filipa Lacerda	2017-02-09	4	-35/+36
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updates expected model in tests
\| \| * \| \| \| \| \| \| \| \|	Adjustments for the new response with counters	Filipa Lacerda	2017-02-09	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	a
\| \| * \| \| \| \| \| \| \| \|	Add support for environment scopes in controller	Grzegorz Bizon	2017-02-09	1	-11/+48
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Adjustments to receive new data schema	Filipa Lacerda	2017-02-09	3	-259/+106
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Enable grouping and pagination in environmnets API	Grzegorz Bizon	2017-02-09	1	-8/+18
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch '28176_merge_widget_fix' into 'master'	Sean McGivern	2017-02-16	1	-3/+3
\|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix error in MR widget after /merge slash command Closes #28176 See merge request !9259