acef028d85
Merge branch 'gh-fix-comments-on-diff'
2016-06-07 13:04:32 +02:00
67c02edccf
Move create! method from formatters to the BaseFormatter
2016-06-06 14:26:28 -03:00
7c072c76fc
Fix importer for GitHub comments on diff
...
Fix comments on diff after LegacyDiffNote was extracted from Note
2016-06-06 12:19:03 -03:00
9437b8a2e4
Import GitHub repositories respecting the API rate limit
...
While Octokit auto pagination set the page size to the maximum 100, and
seek to not overstep the rate limit. When the rate limit is reached its
raises an exception, and stop doing new requests.
Here we use a custom pattern for traversing large lists, so we can
check if we’ll reach the rate limit and wait the API to reset the rate
limit before making new requests.
2016-06-06 12:12:18 -03:00
659d5d4830
Disable Webhooks before proceeding with the GitHub import
2016-06-06 12:07:45 -03:00
3b4f03de8f
Ensure branch cleanup regardless of whether the import process succeeds
2016-06-02 19:48:11 -03:00
86cf9dd253
Enable Lint/LiteralInCondition rubocop cop
...
Checks of literals used in conditions.
See #17478
2016-05-30 12:34:25 +02:00
290aa75e6f
Remove branches that does exist on GitHub after PRs were imported
2016-05-13 17:55:43 -05:00
ebaa19c162
Fix validation method for Gitlab::GithubImport::PullRequestFormatter
2016-05-13 17:55:43 -05:00
795a7ca8f1
Extract GitHub branch formatter
2016-05-13 17:55:42 -05:00
e001bd5e3d
Import PRs where branch names were reused across PRs
2016-05-13 17:55:42 -05:00
7e1f14e215
Preserve commits/diff/comments for PRs that were merged on GitHub
2016-05-13 17:55:42 -05:00
3b50867550
Fix spec for Gitlab::GithubImport::PullRequestFormatter
2016-05-13 16:49:27 -05:00
9b4dc552cb
Import pull requests from GitHub where the target branch was removed
2016-05-13 16:49:27 -05:00
8532dc0d77
Import pull requests from GitHub where the source branch was removed
2016-05-13 16:49:27 -05:00
6fbf6b2936
Fix the line code when importing PR review comments from GitHub
...
Pull Request Review Comments are comments on a portion of the unified
diff.
2016-05-05 10:45:14 -03:00
eede032345
Backport GitHub Enterprise import support from EE
...
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.
2016-04-26 21:00:55 -07:00
f2fe4af19d
Set GitHub milestones to Issue/Merge Request that were imported
2016-04-18 20:07:05 -03:00
06ec511164
Import milestones from GitHub
2016-04-18 20:07:04 -03:00
7462a8f90a
Apply GitHub labels to Issue/Merge Request that were imported
2016-04-18 17:14:59 -03:00
05a4f444c3
Import labels from GitHub
2016-04-18 17:14:59 -03:00
d13bba44f0
Use GitHub Issue/PR number as iid to keep references
...
With these changes we don’t lost the issue/pr references when importing
them to GitLab.
2016-04-18 12:15:50 -03:00
6aeb753ba8
fix github import issues
2016-04-01 15:51:54 +02:00
23146fca18
update bitbucket importer
2016-03-22 12:25:28 +01:00
030b139445
more refactoring
2016-03-21 15:11:05 +01:00
383cc84047
some refactoring based on feedback
2016-03-21 13:15:51 +01:00
5f86912ef0
Merge branches 'fix/project-import_url' and 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/project-import_url
...
# Conflicts:
# db/schema.rb
2016-03-21 09:20:55 +01:00
37b00b16a5
Fix importing PR's from GitHub when the source repo was removed
2016-03-10 19:29:54 -03:00
735563329d
refactored a bunch of stuff based on MR feedback
2016-03-07 12:50:35 +01:00
c2b33d3b71
added import url exposer to construct URL withunencrypted credentials
2016-03-04 16:23:19 +01:00
06b36c00d5
some refactoring in the migration. Also fixed github import issue and updated spec
2016-03-04 12:21:53 +01:00
b58a2e30b2
Wrap errors on GitHub importer to raise Projects::ImportService::Error
2016-01-26 10:56:22 -02:00
4861b1bbfb
Fix import of GitHub's wiki when the repository has not been created
2016-01-21 13:11:38 -02:00
f4bdbecfd5
Fix cross projects detection when importing GitHub pull requests
2016-01-20 19:36:35 -02:00
89e8b82b63
Make sure the .git is at the end on Gitlab::GithubImport::WikiFormatter
2016-01-14 12:09:31 -02:00
60f8434a9d
Refactoring Gitlab::GithubImport::Importer
2016-01-14 12:09:31 -02:00
78f5eb94fb
Import GitHub wiki into GitLab
2016-01-14 12:09:31 -02:00
837a9065f0
Ensure that we're only importing local pull requests
2016-01-05 15:24:55 -02:00
98909dd12c
Generate separate comments when importing GitHub Issues into GitLab
2016-01-05 15:24:55 -02:00
dc72a8b305
Refactoring GithubImport::Importer
2016-01-05 15:24:55 -02:00
6c846ef83d
Extract methods to import comments on a GitHub Pull Request
2016-01-05 15:24:55 -02:00
d72b25811e
Doesn't import GitHub PR where branches were no longer available
2016-01-05 15:24:55 -02:00
f19bf0eaa7
Import comments on the diff of a GitHub Pull Request into GitLab
2016-01-05 15:24:55 -02:00
223f7f5345
Import comments on GitHub Pull Request into GitLab
2016-01-05 15:24:55 -02:00
95f1fe724a
Import GitHub Pull Requests into GitLab
2016-01-05 15:24:55 -02:00
e92ceb7b57
fix specs
2015-11-30 16:12:31 +02:00
e809669383
Fix github importer to handle empty issues
2015-11-18 11:02:25 +00:00
2e9c922dd1
Fix bug where only the first 15 Bitbucket issues would be imported.
...
Also fix a number of issues where author/reporter names were not available.
2015-09-01 08:50:20 -07:00
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
4a203aab57
Fix wrong order of issues when importing from github
...
See API details at https://developer.github.com/v3/issues/ .
Refs #1791
2015-06-28 04:02:21 +09:00
99abbe7dbe
Use Projects::CreateService to create imported projects so hooks are executed.
2015-04-06 14:51:09 +02:00
5cce0645b0
Fix OAuth2 issue importing a new project from GitHub and GitLab
...
Closes #1268
2015-03-22 18:16:48 -07:00
2718955441
Fix import pages not working after first load.
2015-03-13 13:47:26 +01:00
ad6d623234
Add Bitbucket importer.
2015-02-24 15:07:24 +01:00
b3c90dd514
GitHub importer refactoring
2015-02-05 21:48:21 -08:00
1ac20698a5
gitlab.com importer: refactorig
2015-02-05 17:03:43 -08:00
33349dd549
GitLab.com integration: refactoring
2015-02-05 12:50:34 -08:00
18231b0bb3
GitLab.com integration: refactoring
2015-02-05 12:50:34 -08:00
Douwe Maan
Douglas Barbosa Alexandre
Grzegorz Bizon
Stan Hu
James Lopez
Valery Sizov
Arseny Zarechnev
Hiroyuki Sato
Douwe Maan