99ddd1dcbe
Modify GithubImport to support Gitea
...
The reason is that Gitea plan to be GitHub-compatible so it makes sense
to just modify GitHubImport a bit for now, and hopefully we can change
it to GitHubishImport once Gitea is 100%-compatible.
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-12-19 17:35:51 +01:00
4e249d5bae
Use :maximum instead of :within for length validators with a 0..N range
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-12-06 10:23:17 +01:00
8ca040d8ae
Fix branch validation for GitHub PR where repo/fork was renamed/deleted
2016-12-01 00:03:12 -02:00
3228798b37
Refactor github import to reduce number of API calls
...
Ref #24073
2016-11-18 07:47:00 +10:00
14fbd25d06
Modify GitHub importer to be retryable
2016-10-28 11:30:20 +02:00
4259334fb6
Fix applying labels for GitHub-imported MRs
2016-10-27 15:42:28 +02:00
f0ad0ceff5
Fix GitHub importer spec
2016-10-19 14:58:28 -02:00
b5f9541778
Skip wiki creation when GitHub project has wiki enabled
...
If the GitHub project repository has wiki, we should not create
the default wiki. Otherwise the GitHub importer will fail because
the wiki repository already exist.
This bug was introduced here
https://gitlab.com/gitlab-org/gitlab-ce/commit/892dea67717c0efbd6a28f763
9f34535ec0a8747
2016-10-04 13:06:45 -03:00
e30bfb809a
Import all GitHub comments after importing issues and PRs
2016-09-27 20:45:07 +02:00
dbcbbf262b
Speed up label-applying process for GitHub importing
...
* No need to re-fetch issues from GH to read their labels, the labels
are already there from the index request.
* No need to look up labels on the database for every application, so we
cache them.
2016-09-27 20:45:07 +02:00
395a9301b2
Process each page of GitHub resources instead of concating them then processing
...
This should avoid having large memory growth when importing GitHub repos
with lots of resources.
2016-09-27 20:45:07 +02:00
0c65112da7
modify github import JS and controller so we can now specify a namespace and/or name for a project.
...
- Fixed and added specs.
- Added different namespace options depending on user privilages
- Updated docs.
2016-09-20 10:14:39 +02:00
05b52e0f5e
Import GitHub release notes
...
# Conflicts:
# lib/gitlab/github_import/importer.rb
2016-09-13 14:01:22 +10:00
c87235a24d
Merge branch '21569-dont-add-created-by-for-matched-users' into 'master'
...
Only add original author tag line when importing from GitHub if there isn't a linked GitLab account
## What does this MR do?
If there we've found a linked GitLab user for a creator of an issue or comment don't add the 'Created By:' line.
## What are the relevant issue numbers?
Closes #21569
See merge request !6081
2016-09-12 20:08:33 +00:00
02761638f1
Avoid conflict with admin labels when importing GitHub labels
2016-09-09 11:22:38 -03:00
4a788f8a0c
Only add the original author if there isn't a linked GitLab account
2016-09-08 20:48:35 +10:00
d308a3f433
Merge branch 'issue_19734' into 'master'
...
Project tools visibility level
## part of #19734
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG ) entry added
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md )
- [x] API support added
- Tests
- [x] Added for this feature/bug
- [x] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides )
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits )
See merge request !5606
2016-09-01 15:28:14 +00:00
892dea6771
Project tools visibility level
2016-09-01 11:47:59 -03:00
9b376e772e
GitHub importer use default project visibility for non-private projects
2016-08-31 18:27:42 -03:00
52daddc0b7
Use updated_at as the last updated date when importing from GitHub
2016-08-31 13:20:28 -03:00
2986de7c8c
Add readable error message when remote data could not be fully imported
2016-08-24 12:17:13 -03:00
3c09000e18
Does not halt the GitHub import process when an error occurs
2016-08-24 12:16:42 -03:00
0a1535a9f4
Prefixes removed branches name with PR number when importing PR from GH
2016-08-08 20:24:40 -03:00
167a0c7f0b
Remove SHA suffix for removed branches name when importing PR from GH
2016-08-08 19:39:59 -03:00
1e736fb527
Allow users to import cross-repository pull requests from GitHub
2016-08-04 17:16:50 -03:00
51cf14b37c
Does not need to disable GitHub webhooks since PRs are check out locally
2016-08-04 17:16:50 -03:00
3ddcd0d699
Remove unnecessary context from GitHub client spec
2016-07-12 12:14:17 -03:00
38a58978aa
Fix GItHub client requests when rate limit is disabled
2016-07-12 12:14:17 -03:00
6ce25e7b4c
Rename MergeRequest methods that return commits or shas to be more clear and consistent
2016-07-06 18:50:58 -04:00
5f86a084f2
Consider that a GH exists only if both `ref`, and `sha` exist
2016-07-06 13:08:12 -03:00
9e211091a8
Enable Style/EmptyLines cop, remove redundant ones
2016-07-01 21:56:17 +02:00
12aa1f898d
Import from Github using Personal Access Tokens.
...
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.
2016-06-30 18:48:17 +02:00
8c5712a422
Merge branch 'gh-disable-webhooks'
2016-06-07 13:06:43 +02: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
659d5d4830
Disable Webhooks before proceeding with the GitHub import
2016-06-06 12:07:45 -03: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
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
0ed0758735
Use double instead of OpenStruct in the Issue/PR formatters specs
2016-04-18 20:07:05 -03: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
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
dff4050f1d
fixed some rubocop warnings
2016-03-21 17:29:19 +01:00
030b139445
more refactoring
2016-03-21 15:11:05 +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
7085850c50
fix specs
2016-03-04 18:37:00 +01:00
06b36c00d5
some refactoring in the migration. Also fixed github import issue and updated spec
2016-03-04 12:21:53 +01: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
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
13d6bab177
Tag lib specs
2015-12-09 11:55:42 +01: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
15a05be70d
Fix Style/Blocks cop violations
2015-06-22 16:00:54 -04:00
80097606f5
Make sure user has access to namespace in import tests.
2015-04-15 16:58:43 +02:00
5cce0645b0
Fix OAuth2 issue importing a new project from GitHub and GitLab
...
Closes #1268
2015-03-22 18:16:48 -07:00
ad6d623234
Add Bitbucket importer.
2015-02-24 15:07:24 +01:00
Rémy Coutable
Douglas Barbosa Alexandre
Andrew Smith
Ahmad Sherif
James Lopez
Robert Speicher
Douwe Maan
Felipe Artur
Douwe Maan
Grzegorz Bizon
Eric K Idema
Stan Hu
Robert Speicher