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

	Commit message (Collapse)	Author	Age	Files	Lines
*	restricted note edit shortcut to only up keylbennett/gitlab-ce-18113-edit-note-shortcut-conflicting	Luke "Jared" Bennett	2016-06-17	1	-1/+4
\| \| \| \| \| \| \| \|	Updated CHANGELOG Removed CHANGELOG entry Moved conditional to helper method
*	Merge branch 'feature/project-export' into 'master'	Douwe Maan	2016-06-17	69	-42/+7239
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Export project functionality This is a MR for the export functionality of https://gitlab.com/gitlab-org/gitlab-ce/issues/3050, which adds the ability to export single projects. - [x] members - DB data - [x] issues - [x] issue comments - [x] merge requests - [x] merge request diff - [x] merge request comments - [x] labels - [x] milestones - [x] snippets - [x] releases - [x] events - [x] commit statuses - [x] CI builds - File system data - [x] Git repository - [x] wiki - [x] uploads - [ ] ~~CI build traces~~ - [ ] ~~CI build artifacts~~ - [ ] ~~LFS objects~~ - DB configuration - [x] services - [x] web hooks - [x] protected branches - [x] deploy keys - [x] CI variables - [x] CI triggers See merge request !3114
\| *	Merge branch 'feature/project-import' into 'feature/project-export'	Douwe Maan	2016-06-17	60	-63/+6353
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Project import functionality This is a MR for the import functionality of https://gitlab.com/gitlab-org/gitlab-ce/issues/3050, which adds the ability to import single projects. Branched off https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3114 - [x] members - DB data - [x] issues - [x] issue comments - [x] merge requests - [x] merge request diff - [x] merge request comments - [x] labels - [x] milestones - [x] snippets - [x] releases - [x] events - [x] commit statuses - [x] CI builds - File system data - [x] Git repository - [x] wiki - [x] uploads - [ ] ~~CI build traces~~ - [ ] ~~CI build artifacts~~ - [ ] ~~LFS objects~~ - DB configuration - [x] services - [x] web hooks - [x] protected branches - [x] deploy keys - [x] CI variables - [x] CI triggers See merge request !3142
\| \| *	Merge branch 'feature/project-export-ui-experimental' into ↵feature/project-import	Douwe Maan	2016-06-17	45	-218/+503
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'feature/project-import' Experimental UI for exporting and importing a project Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/3050 Screenshots of both the export and import processes: ## Export 1 - Project settings ![Screen_Shot_2016-06-16_at_15.29.27](/uploads/ec59113dae9132e594b79289e3598f5c/Screen_Shot_2016-06-16_at_15.29.27.png) 2 - Flash after clicking on export ![Screen_Shot_2016-06-16_at_15.29.47](/uploads/02f20d1500de4e0c9693218f9fb2c414/Screen_Shot_2016-06-16_at_15.29.47.png) 3 - Email received with download link ![Screen_Shot_2016-06-16_at_15.36.19](/uploads/0f7e0a74125d9f1fa067eb52104397a5/Screen_Shot_2016-06-16_at_15.36.19.png) 4 - The project settings export screen changes so we can either delete the file or download it again (it won't generate a new export, unless we delete it first) ![Screen_Shot_2016-06-16_at_15.28.43](/uploads/073f87cc751a857eac94e55d1d0c4ef9/Screen_Shot_2016-06-16_at_15.28.43.png) 5 - After delete flash ![Screen_Shot_2016-06-16_at_15.29.10](/uploads/e80341aebcaed8f7713868793fda2b92/Screen_Shot_2016-06-16_at_15.29.10.png) ## Import 1 - New project page with new gitlab export option ![Screen_Shot_2016-06-16_at_15.31.25](/uploads/246e823a52c5b0216354c4f5321f846b/Screen_Shot_2016-06-16_at_15.31.25.png) 2 - Next step importing - choosing a file ![Screen_Shot_2016-06-16_at_15.32.23](/uploads/f91e72f68cc844577a0fc1935e3936d3/Screen_Shot_2016-06-16_at_15.32.23.png) 3 - Import in progress ![Screen_Shot_2016-06-16_at_15.32.48](/uploads/41c774c0c03a91b60cd220ce77cab8e6/Screen_Shot_2016-06-16_at_15.32.48.png) 4 - Import successful ![Screen_Shot_2016-06-16_at_15.32.54](/uploads/337f9a07779999d00232f7ac61ed362b/Screen_Shot_2016-06-16_at_15.32.54.png) See merge request !4012
\| \| \| *	a few changes based on MR feedback	James Lopez	2016-06-17	6	-10/+17
\| \| \| \|
\| \| \| *	fixed changelog - [ci skip]feature/project-export-ui-experimental	James Lopez	2016-06-16	1	-9/+0
\| \| \| \|
\| \| \| *	fixed merge conflicts on UI branch	James Lopez	2016-06-16	405	-3053/+16766
\| \| \| \|\ \| \| \| \|/ \| \| \|/\|
\| \| * \|	fixed merge conflicts	James Lopez	2016-06-16	405	-3056/+16760
\| \| \|\ \ \| \| \|/ / \| \|/\| \|
\| * \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵feature/project-export	James Lopez	2016-06-16	405	-3056/+16760
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	feature/project-export # Conflicts: # app/models/ci/pipeline.rb
\| * \| \| \|	Revert "squashed merge and fixed conflicts"	James Lopez	2016-06-16	403	-16738/+3046
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 13e37a3ee5c943525a99481b855d654e97e8597c.
\| * \| \| \|	squashed merge and fixed conflicts	James Lopez	2016-06-16	403	-3046/+16738
\| \| \| \| \|
\| * \| \| \|	fix indents	James Lopez	2016-06-14	1	-5/+5
\| \| \| \| \|
\| \| \| \| *	fix spinach test	James Lopez	2016-06-16	1	-1/+1
\| \| \| \| \|
\| \| \| \| *	fix wiki stuff	James Lopez	2016-06-16	1	-2/+1
\| \| \| \| \|
\| \| \| \| *	fix specs	James Lopez	2016-06-16	1	-1/+1
\| \| \| \| \|
\| \| \| \| *	lots of refactoring again based on feedback. Changed the UI slightly and ↵	James Lopez	2016-06-15	16	-64/+105
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	also fixed a small bug
\| \| \| \| *	fix annoying spec	James Lopez	2016-06-15	1	-1/+1
\| \| \| \| \|
\| \| \| \| *	fixing specs and some code cleanup	James Lopez	2016-06-15	6	-7/+13
\| \| \| \| \|
\| \| \| \| *	cleanup namespace check now done by service	James Lopez	2016-06-15	1	-11/+0
\| \| \| \| \|
\| \| \| \| *	enable retry on worker	James Lopez	2016-06-15	1	-2/+1
\| \| \| \| \|
\| \| \| \| *	fix changelog	James Lopez	2016-06-15	1	-2/+1
\| \| \| \| \|
\| \| \| \| *	some refactoring - renaming things, etc..	James Lopez	2016-06-15	3	-8/+8
\| \| \| \| \|
\| \| \| \| *	project export archiver	James Lopez	2016-06-14	4	-3/+22
\| \| \| \| \|
\| \| \| \| *	get rid of old worker	James Lopez	2016-06-14	1	-24/+0
\| \| \| \| \|
\| \| \| \| *	yay finally importing working with the new services structure	James Lopez	2016-06-14	3	-3/+3
\| \| \| \| \|
\| \| \| \| *	few fixes after refactoring the whole UI stuff	James Lopez	2016-06-14	5	-10/+8
\| \| \| \| \|
\| \| \| \| *	adapted current services stuff to use new project import, plus fixes a few ↵	James Lopez	2016-06-14	8	-49/+42
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	issues, updated routes, etc...
\| \| \| \| *	Merge branches 'feature/project-export-ui-experimental' and ↵	James Lopez	2016-06-14	1	-1/+1
\| \| \| \| \|\ \| \| \| \| \|/ \| \| \| \|/\| \| \| \| \| \|	'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental
\| \| \| * \|	fix merge issue	James Lopez	2016-06-14	1	-1/+1
\| \| \| \| \|
\| \| \| \| *	adding notifications stuff and more refactoring for exporting projects	James Lopez	2016-06-14	13	-29/+84
\| \| \| \| \|
\| \| \| \| *	new export stuff and view	James Lopez	2016-06-14	4	-12/+26
\| \| \| \| \|
\| \| \| \| *	lots of refactoring to reuse import service	James Lopez	2016-06-14	15	-179/+143
\| \| \| \| \|
\| \| \| \| *	Merge branches 'feature/project-export-ui-experimental' and ↵	James Lopez	2016-06-14	8	-35/+95
\| \| \| \| \|\ \| \| \| \| \|/ \| \| \| \|/\| \| \| \| \| \|	'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental
\| \| \| * \|	updated relation_factory based on MR feedback	James Lopez	2016-06-14	1	-3/+3
\| \| \| \| \|
\| \| \| * \|	fix merge	James Lopez	2016-06-14	2	-6/+6
\| \| \| \| \|
\| \| \| * \|	Merge branches 'feature/project-export' and 'feature/project-import' of ↵	James Lopez	2016-06-14	6	-31/+91
\| \| \| \|\ \ \| \| \|_\|/ / \| \|/\| \| \| \| \| \| \| \|	gitlab.com:gitlab-org/gitlab-ce into feature/project-import
\| * \| \| \|	missed line break	James Lopez	2016-06-14	1	-0/+1
\| \| \| \| \|
\| * \| \| \|	better coverage for Reader	James Lopez	2016-06-14	1	-0/+61
\| \| \| \| \|
\| * \| \| \|	few changes based on MR feedback	James Lopez	2016-06-13	3	-3/+3
\| \| \| \| \|
\| * \| \| \|	fix file.write	James Lopez	2016-06-13	1	-3/+1
\| \| \| \| \|
\| \| \| \| *	WIP - starting refactoring import/export to use services	James Lopez	2016-06-13	5	-8/+55
\| \| \| \| \|
\| \| \| \| *	Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce ↵	James Lopez	2016-06-13	4	-34/+40
\| \| \| \| \|\ \| \| \| \| \|/ \| \| \| \|/\| \| \| \| \| \|	into feature/project-export-ui-experimental
\| \| \| * \|	refactored notes logic	James Lopez	2016-06-13	1	-3/+5
\| \| \| \| \|
\| \| \| * \|	few more changes based on feedback	James Lopez	2016-06-13	4	-17/+26
\| \| \| \| \|
\| \| \| * \|	addressing MR feedback, few changes to members mapper	James Lopez	2016-06-13	1	-15/+10
\| \| \| \| \|
\| \| \| \| *	Merge branches 'feature/project-export-ui-experimental' and ↵	James Lopez	2016-06-13	3	-3/+3
\| \| \| \| \|\ \| \| \| \| \|/ \| \| \| \|/\| \| \| \| \| \|	'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental
\| \| \| * \|	corrected a few warnings	James Lopez	2016-06-13	3	-3/+3
\| \| \| \| \|
\| \| \| \| *	fix gemfile	James Lopez	2016-06-13	1	-2/+2
\| \| \| \| \|
\| \| \| \| *	Merge branches 'feature/project-export-ui-experimental' and ↵	James Lopez	2016-06-13	1841	-12581/+33110
\| \| \| \| \|\ \| \| \| \| \|/ \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental # Conflicts: # Gemfile.lock # app/helpers/todos_helper.rb # app/models/todo.rb # app/views/projects/edit.html.haml # lib/gitlab/import_export/import_service.rb
\| \| \| * \|	Merge branches 'feature/project-export' and 'feature/project-import' of ↵	James Lopez	2016-06-13	1	-1/+1
\| \| \| \|\ \ \| \| \|_\|/ / \| \|/\| \| \| \| \| \| \| \|	gitlab.com:gitlab-org/gitlab-ce into feature/project-import