Commit graph

19 commits

Author SHA1 Message Date
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
James Lopez
bdcd23b297 Create subgroups if they don't exist while importing projects 2017-04-05 10:09:31 +00:00
Stan Hu
07415e474e Fix Error 500 when Bitbucket importer does not have authorization
Closes #29739
2017-03-20 22:17:46 -07:00
Robert Speicher
4642ca6686 Use empty_project where possible in controller specs 2017-01-25 17:14:38 -05:00
Stan Hu
7953480646 Fix remaining Bitbucket controller specs 2016-11-21 16:47:30 -08:00
Stan Hu
af6926283b Fix Bitbucket status controller spec 2016-11-21 16:47:30 -08:00
Stan Hu
7ba65d05af Fix Bitbucket callback spec 2016-11-21 16:47:30 -08: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
Stan Hu
d7accda1ae Show incompatible projects in Bitbucket import status
See #1871
2015-08-07 07:07:08 -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
Douwe Maan
ad6d623234 Add Bitbucket importer. 2015-02-24 15:07:24 +01:00