GitLab Bot
							
						 
						
							 
							
							
							
							
								
							
							
								bdca097916 
								
							 
						 
						
							
							
								
								Add latest changes from gitlab-org/gitlab@master  
							
							 
							
							
							
						 
						
							2020-08-11 03:11:00 +00:00  
						
					 
				
					
						
							
							
								 
								GitLab Bot
							
						 
						
							 
							
							
							
							
								
							
							
								d5cf5cf4f7 
								
							 
						 
						
							
							
								
								Add latest changes from gitlab-org/gitlab@master  
							
							 
							
							
							
						 
						
							2020-07-17 00:09:37 +00:00  
						
					 
				
					
						
							
							
								 
								GitLab Bot
							
						 
						
							 
							
							
							
							
								
							
							
								4774fa00b7 
								
							 
						 
						
							
							
								
								Add latest changes from gitlab-org/gitlab@master  
							
							 
							
							
							
						 
						
							2020-06-15 15:08:20 +00:00  
						
					 
				
					
						
							
							
								 
								GitLab Bot
							
						 
						
							 
							
							
							
							
								
							
							
								640e72ca92 
								
							 
						 
						
							
							
								
								Add latest changes from gitlab-org/gitlab@master  
							
							 
							
							
							
						 
						
							2020-06-04 03:08:05 +00:00  
						
					 
				
					
						
							
							
								 
								GitLab Bot
							
						 
						
							 
							
							
							
							
								
							
							
								0d6fa03312 
								
							 
						 
						
							
							
								
								Add latest changes from gitlab-org/gitlab@master  
							
							 
							
							
							
						 
						
							2020-02-06 18:08:54 +00:00  
						
					 
				
					
						
							
							
								 
								GitLab Bot
							
						 
						
							 
							
							
							
							
								
							
							
								1ce6af4aad 
								
							 
						 
						
							
							
								
								Add latest changes from gitlab-org/gitlab@master  
							
							 
							
							
							
						 
						
							2020-01-24 00:08:51 +00:00  
						
					 
				
					
						
							
							
								 
								GitLab Bot
							
						 
						
							 
							
							
							
							
								
							
							
								29c01c6c91 
								
							 
						 
						
							
							
								
								Add latest changes from gitlab-org/gitlab@master  
							
							 
							
							
							
						 
						
							2019-11-14 03:06:25 +00:00  
						
					 
				
					
						
							
							
								 
								Heinrich Lee Yu
							
						 
						
							 
							
							
							
							
								
							
							
								1ce5bcacdb 
								
							 
						 
						
							
							
								
								Remove code related to object hierarchy in MySQL  
							
							 
							
							... 
							
							
							
							These are not required because MySQL is not
supported anymore 
							
						 
						
							2019-07-25 15:35:06 +08:00  
						
					 
				
					
						
							
							
								 
								gfyoung
							
						 
						
							 
							
							
							
							
								
							
							
								93a44e135b 
								
							 
						 
						
							
							
								
								Add some frozen string to spec/**/*.rb  
							
							 
							
							... 
							
							
							
							Adds frozen string to the following:
* spec/bin/**/*.rb
* spec/config/**/*.rb
* spec/controllers/**/*.rb
xref https://gitlab.com/gitlab-org/gitlab-ce/issues/59758  
							
						 
						
							2019-04-15 10:17:05 +00:00  
						
					 
				
					
						
							
							
								 
								blackst0ne
							
						 
						
							 
							
							
							
							
								
							
							
								b44a2c801a 
								
							 
						 
						
							
							
								
								Update specs to rails5 format  
							
							 
							
							... 
							
							
							
							Updates specs to use new rails5 format.
The old format:
`get :show, { some: params }, { some: headers }`
The new format:
`get :show, params: { some: params }, headers: { some: headers }` 
							
						 
						
							2018-12-19 10:04:31 +11:00  
						
					 
				
					
						
							
							
								 
								Lin Jen-Shin
							
						 
						
							 
							
							
							
							
								
							
							
								ab286656b2 
								
							 
						 
						
							
							
								
								Resolve "Namespace factory is problematic"  
							
							 
							
							
							
						 
						
							2018-04-23 15:48:26 +00:00  
						
					 
				
					
						
							
							
								 
								James Lopez
							
						 
						
							 
							
							
							
							
								
							
							
								68e31c098e 
								
							 
						 
						
							
							
								
								Merge branch 'fix/gh-namespace-issue' into 'security-10-4'  
							
							 
							
							... 
							
							
							
							[10.4] Fix GH namespace security issue 
							
						 
						
							2018-02-09 12:16:28 -06:00  
						
					 
				
					
						
							
							
								 
								Clement Ho
							
						 
						
							 
							
							
							
							
								
							
							
								71c948d637 
								
							 
						 
						
							
							
								
								Replace $.post in importer status with axios  
							
							 
							
							
							
						 
						
							2018-02-09 11:14:48 +00:00  
						
					 
				
					
						
							
							
								 
								Robert Speicher
							
						 
						
							 
							
							
							
							
								
							
							
								72a7b30c9f 
								
							 
						 
						
							
							
								
								Change all `:empty_project` to `:project`  
							
							 
							
							
							
						 
						
							2017-08-02 17:47:31 -04:00  
						
					 
				
					
						
							
							
								 
								Grzegorz Bizon
							
						 
						
							 
							
							
							
							
								
							
							
								0430b76441 
								
							 
						 
						
							
							
								
								Enable Style/DotPosition Rubocop  👮  
							
							 
							
							
							
						 
						
							2017-06-21 13:48:12 +00:00  
						
					 
				
					
						
							
							
								 
								Douwe Maan
							
						 
						
							 
							
							
							
							
								
							
							
								43b1750892 
								
							 
						 
						
							
							
								
								Revert "Remove changes that are not absolutely necessary"  
							
							 
							
							... 
							
							
							
							This reverts commit b0498c176f 
							
						 
						
							2017-05-24 20:59:26 +00:00  
						
					 
				
					
						
							
							
								 
								Douwe Maan
							
						 
						
							 
							
							
							
							
								
							
							
								b0498c176f 
								
							 
						 
						
							
							
								
								Remove changes that are not absolutely necessary  
							
							 
							
							
							
						 
						
							2017-05-23 20:38:35 -05:00  
						
					 
				
					
						
							
							
								 
								Douwe Maan
							
						 
						
							 
							
							
							
							
								
							
							
								ed16c351c5 
								
							 
						 
						
							
							
								
								Fix specs  
							
							 
							
							
							
						 
						
							2017-05-23 20:38:26 -05:00  
						
					 
				
					
						
							
							
								 
								James Lopez
							
						 
						
							 
							
							
							
							
								
							
							
								bdcd23b297 
								
							 
						 
						
							
							
								
								Create subgroups if they don't exist while importing projects  
							
							 
							
							
							
						 
						
							2017-04-05 10:09:31 +00:00  
						
					 
				
					
						
							
							
								 
								Robert Speicher
							
						 
						
							 
							
							
							
							
								
							
							
								4642ca6686 
								
							 
						 
						
							
							
								
								Use `empty_project` where possible in controller specs  
							
							 
							
							
							
						 
						
							2017-01-25 17:14:38 -05:00  
						
					 
				
					
						
							
							
								 
								Douglas Barbosa Alexandre
							
						 
						
							 
							
							
							
							
								
							
							
								325de662ce 
								
							 
						 
						
							
							
								
								Don't create groups for unallowed users when importing projects  
							
							 
							
							
							
						 
						
							2016-08-31 12:55:45 -03:00  
						
					 
				
					
						
							
							
								 
								Kamil Trzcinski
							
						 
						
							 
							
							
							
							
								
							
							
								a0adafddd0 
								
							 
						 
						
							
							
								
								Remove require_relative 'import_spec_helper'  
							
							 
							
							
							
						 
						
							2016-06-08 18:18:49 +02:00  
						
					 
				
					
						
							
							
								 
								Stan Hu
							
						 
						
							 
							
							
							
							
								
							
							
								ed1d4fa477 
								
							 
						 
						
							
							
								
								Remove user OAuth tokens stored in database for Bitbucket, GitHub, and GitLab  
							
							 
							
							... 
							
							
							
							and request them each session. Pass these tokens to the project import data.
This prevents the need to encrypt these tokens and clear them in case they
expire or get revoked.
For example, if you deleted and re-created OAuth2 keys for Bitbucket, you would get
an Error 500 with no way to recover:
```
Started GET "/import/bitbucket/status" for x.x.x.x at 2015-08-07 05:24:10 +0000
Processing by Import::BitbucketController#status as HTML
Completed 500 Internal Server Error in 607ms (ActiveRecord: 2.3ms)
NameError (uninitialized constant Import::BitbucketController::Unauthorized):
  app/controllers/import/bitbucket_controller.rb:77:in `rescue in go_to_bitbucket_for_permissions'
  app/controllers/import/bitbucket_controller.rb:74:in `go_to_bitbucket_for_permissions'
  app/controllers/import/bitbucket_controller.rb:86:in `bitbucket_unauthorized'
```
Closes  #1871  
							
						 
						
							2015-08-23 09:23:44 -07:00  
						
					 
				
					
						
							
							
								 
								Dmitriy Zaporozhets
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								f40b99d02e 
								
							 
						 
						
							
							
								
								Merge branch 'master' into rubocop-for-tests  
							
							 
							
							... 
							
							
							
							Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
	spec/features/issues_spec.rb
	spec/models/forked_project_link_spec.rb
	spec/models/hooks/service_hook_spec.rb
	spec/models/hooks/web_hook_spec.rb
	spec/models/project_services/hipchat_service_spec.rb
	spec/requests/api/project_members_spec.rb
	spec/requests/api/projects_spec.rb
	spec/requests/api/system_hooks_spec.rb
	spec/services/archive_repository_service_spec.rb
	spec/support/matchers.rb
	spec/tasks/gitlab/backup_rake_spec.rb 
							
						 
						
							2015-06-23 10:44:03 +02:00  
						
					 
				
					
						
							
							
								 
								Robert Speicher
							
						 
						
							 
							
							
							
							
								
							
							
								15a05be70d 
								
							 
						 
						
							
							
								
								Fix Style/Blocks cop violations  
							
							 
							
							
							
						 
						
							2015-06-22 16:00:54 -04:00  
						
					 
				
					
						
							
							
								 
								Robert Speicher
							
						 
						
							 
							
							
							
							
								
							
							
								dad88568f3 
								
							 
						 
						
							
							
								
								Update and simplify Import controller specs  
							
							 
							
							
							
						 
						
							2015-06-22 12:13:46 +02:00  
						
					 
				
					
						
							
							
								 
								Douwe Maan
							
						 
						
							 
							
							
							
							
								
							
							
								d92e4ccc6e 
								
							 
						 
						
							
							
								
								Add tests.  
							
							 
							
							
							
						 
						
							2015-04-01 17:17:18 +02:00  
						
					 
				
					
						
							
							
								 
								Douwe Maan
							
						 
						
							 
							
							
							
							
								
							
							
								f2b37de54b 
								
							 
						 
						
							
							
								
								Fix specs.  
							
							 
							
							
							
						 
						
							2015-02-24 15:07:24 +01:00  
						
					 
				
					
						
							
							
								 
								Jeroen van Baarsen
							
						 
						
							 
							
							
							
							
								
							
							
								940a402b6e 
								
							 
						 
						
							
							
								
								Fixed hound warnings  
							
							 
							
							... 
							
							
							
							Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com> 
							
						 
						
							2015-02-12 19:32:58 +01:00  
						
					 
				
					
						
							
							
								 
								Jeroen van Baarsen
							
						 
						
							 
							
							
							
							
								
							
							
								0c4a70a306 
								
							 
						 
						
							
							
								
								Updated rspec to rspec 3.x syntax  
							
							 
							
							... 
							
							
							
							Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com> 
							
						 
						
							2015-02-12 19:17:35 +01:00  
						
					 
				
					
						
							
							
								 
								Valery Sizov
							
						 
						
							 
							
							
							
							
								
							
							
								33349dd549 
								
							 
						 
						
							
							
								
								GitLab.com integration: refactoring  
							
							 
							
							
							
						 
						
							2015-02-05 12:50:34 -08:00