delta/gitlab/gitlab-ce.git/spec/controllers/import, branch multi-line-inline-diff

Import from Github using Personal Access Tokens.

2016-06-30T16:48:17+00:00

This stands as an alternative to using OAuth to access a user's Github
repositories.  This is setup in such a way that it can be used without OAuth
configuration.

From a UI perspective, the how to import modal has been replaced by a full
page, which includes a form for posting a personal access token back to the
Import::GithubController.

If the user has logged in via GitHub, skip the Personal Access Token and go
directly to Github for an access token via OAuth.

Remove require_relative 'import_spec_helper'

2016-06-08T16:18:49+00:00

Move ImportSpecHelper to spec/support/

2016-06-08T15:21:08+00:00

Make Omniauth providers specs to not modify global configuration

2016-06-08T14:50:05+00:00

Backport GitHub Enterprise import support from EE

2016-04-27T04:00:55+00:00

These changes were pulled from GitLab EE to support configuring
an alternative API URL than the default https://api.github.com.
In addition, the `verify_ssl` flag allows users to disable SSL cert
checking.

One modification: add a default `args` option if it does not exist
to avoid breaking existing configurations.

Fix duplicate repositories in GitHub import page

2015-10-19T17:39:59+00:00

By default, all the current user's repositories are accessible via the
/users endpoint. There's no need to traverse all the organization
repositories as well.

See:

* http://www.rubydoc.info/github/pengwynn/octokit/Octokit/Client/Repositories#repositories-instance_method
* https://developer.github.com/v3/repos/#list-your-repositories

Closes #2523

FogBugz project import

2015-09-09T00:23:01+00:00

Remove user OAuth tokens stored in database for Bitbucket, GitHub, and GitLab

2015-08-23T16:23:44+00:00

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

Show incompatible projects in Bitbucket import status

2015-08-07T14:07:08+00:00

See #1871

Merge branch 'master' into rubocop-for-tests

2015-06-23T08:44:03+00:00

Signed-off-by: Dmitriy Zaporozhets 

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