James Lopez
							
						 
						
							 
							
							
							
							
								
							
							
								77b7bfd463 
								
							 
						 
						
							
							
								
								Fix import/export labels to cope with project and group labels. Added relevant specs.  
							
							 
							
							
							
						 
						
							2016-10-19 14:58:25 -02:00  
						
					 
				
					
						
							
							
								 
								James Lopez
							
						 
						
							 
							
							
							
							
								
							
							
								3c7feaf3b1 
								
							 
						 
						
							
							
								
								Fixed label color issue and added Import/Export versioning table  
							
							 
							
							
							
						 
						
							2016-09-19 09:18:37 +02:00  
						
					 
				
					
						
							
							
								 
								James Lopez
							
						 
						
							 
							
							
							
							
								
							
							
								e74b7d665b 
								
							 
						 
						
							
							
								
								squashed - Fix DB exceptions raised importing some specific projects.  
							
							 
							
							... 
							
							
							
							Better import of labels, milestones and protected branches. Updated relevant specs.
Loose pipeline validation on importing, so it does not fail when there are missing fields, which are not validated at DB level. Also, updated spec with relevant test. 
							
						 
						
							2016-09-19 09:18:37 +02:00  
						
					 
				
					
						
							
							
								 
								James Lopez
							
						 
						
							 
							
							
							
							
								
							
							
								6a0bbb5aa5 
								
							 
						 
						
							
							
								
								using shared path for project import uploads and refactored gitlab remove export worker  
							
							 
							
							
							
						 
						
							2016-08-04 12:51:55 +02:00  
						
					 
				
					
						
							
							
								 
								James Lopez
							
						 
						
							 
							
							
							
							
								
							
							
								aad0ae7162 
								
							 
						 
						
							
							
								
								squashed - fixed label and milestone association problems, updated specs and refactored reader class a bit  
							
							 
							
							
							
						 
						
							2016-08-01 09:57:40 +02:00  
						
					 
				
					
						
							
							
								 
								James Lopez
							
						 
						
							 
							
							
							
							
								
							
							
								bf1ea8c6fe 
								
							 
						 
						
							
							
								
								Squashed - fix encoding issue  
							
							 
							
							... 
							
							
							
							WIP - trying to replicate UTF-8 error
fix spec
fixing encoding issue and another spec, to do with MR diffs
fix issue and spec failure
Add changelog and bumped up I/E version
fix spec based on feedback - omitted target project 
							
						 
						
							2016-07-19 09:59:54 +02:00  
						
					 
				
					
						
							
							
								 
								James Lopez
							
						 
						
							 
							
							
							
							
								
							
							
								65549a5866 
								
							 
						 
						
							
							
								
								add project name and namespace to filename on project export  
							
							 
							
							... 
							
							
							
							added changelog 
							
						 
						
							2016-07-15 12:55:28 +02:00  
						
					 
				
					
						
							
							
								 
								James Lopez
							
						 
						
							 
							
							
							
							
								
							
							
								5cd3d7c40a 
								
							 
						 
						
							
							
								
								bump version - as old exports wont be compatible  
							
							 
							
							
							
						 
						
							2016-06-29 10:49:31 +02:00  
						
					 
				
					
						
							
							
								 
								James Lopez
							
						 
						
							 
							
							
							
							
								
							
							
								d5b3a266e8 
								
							 
						 
						
							
							
								
								use rails root join  
							
							 
							
							
							
						 
						
							2016-06-20 09:17:07 +02:00  
						
					 
				
					
						
							
							
								 
								James Lopez
							
						 
						
							 
							
							
							
							
								
							
							
								cee2a2dc66 
								
							 
						 
						
							
							
								
								fixed a couple of errors spotted in production  
							
							 
							
							
							
						 
						
							2016-06-20 08:58:43 +02:00  
						
					 
				
					
						
							
							
								 
								James Lopez
							
						 
						
							 
							
							
							
							
								
							
							
								ad68bc63b5 
								
							 
						 
						
							
							
								
								Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	app/models/project.rb
#	db/schema.rb
#	lib/gitlab/import_export/import_export_reader.rb 
							
						 
						
							2016-06-13 12:43:25 +02:00  
						
					 
				
					
						
							
							
								 
								James Lopez
							
						 
						
							 
							
							
							
							
								
							
							
								771f735109 
								
							 
						 
						
							
							
								
								few more modifications based on comments  
							
							 
							
							
							
						 
						
							2016-06-13 09:37:58 +02:00  
						
					 
				
					
						
							
							
								 
								James Lopez
							
						 
						
							 
							
							
							
							
								
							
							
								1466997755 
								
							 
						 
						
							
							
								
								import uploads. Fixed a few things to do with members, triggers, etc...  
							
							 
							
							
							
						 
						
							2016-05-19 15:36:20 +02:00  
						
					 
				
					
						
							
							
								 
								James Lopez
							
						 
						
							 
							
							
							
							
								
							
							
								504c186f71 
								
							 
						 
						
							
							
								
								fix version issue  
							
							 
							
							
							
						 
						
							2016-05-16 13:28:11 +02:00  
						
					 
				
					
						
							
							
								 
								James Lopez
							
						 
						
							 
							
							
							
							
								
							
							
								5777ad9a1f 
								
							 
						 
						
							
							
								
								adding versioning to export  
							
							 
							
							
							
						 
						
							2016-05-16 12:04:31 +02:00  
						
					 
				
					
						
							
							
								 
								James Lopez
							
						 
						
							 
							
							
							
							
								
							
							
								2dff04f24a 
								
							 
						 
						
							
							
								
								fixed TODOs left  
							
							 
							
							
							
						 
						
							2016-05-13 17:39:03 +02:00  
						
					 
				
					
						
							
							
								 
								James Lopez
							
						 
						
							 
							
							
							
							
								
							
							
								a5d59f075a 
								
							 
						 
						
							
							
								
								added better error handling. Also refactored some of the code and fixed a few issues in project_tree_saver  
							
							 
							
							
							
						 
						
							2016-05-10 17:15:20 +02:00  
						
					 
				
					
						
							
							
								 
								James Lopez
							
						 
						
							 
							
							
							
							
								
							
							
								21be0cae62 
								
							 
						 
						
							
							
								
								fixing merge issues  
							
							 
							
							
							
						 
						
							2016-05-09 18:33:48 +02:00  
						
					 
				
					
						
							
							
								 
								James Lopez
							
						 
						
							 
							
							
							
							
								
							
							
								8ac53eb5d0 
								
							 
						 
						
							
							
								
								started refactoring import export reader - WIP  
							
							 
							
							
							
						 
						
							2016-05-06 17:55:06 +02:00  
						
					 
				
					
						
							
							
								 
								James Lopez
							
						 
						
							 
							
							
							
							
								
							
							
								ce598b0541 
								
							 
						 
						
							
							
								
								fixed and refactored a few things based on MR feedback  
							
							 
							
							
							
						 
						
							2016-05-06 13:40:02 +02:00  
						
					 
				
					
						
							
							
								 
								James Lopez
							
						 
						
							 
							
							
							
							
								
							
							
								4256743686 
								
							 
						 
						
							
							
								
								refactored path stuff  
							
							 
							
							
							
						 
						
							2016-04-22 12:18:11 +02:00  
						
					 
				
					
						
							
							
								 
								James Lopez
							
						 
						
							 
							
							
							
							
								
							
							
								0852f539aa 
								
							 
						 
						
							
							
								
								refactored stuff, added a save and compress all class and moved mostly everything to lib  
							
							 
							
							
							
						 
						
							2016-04-14 16:57:25 +02:00