Andrew Smith
05b52e0f5e
Import GitHub release notes
...
# Conflicts:
# lib/gitlab/github_import/importer.rb
2016-09-13 14:01:22 +10:00
Robert Speicher
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
Douglas Barbosa Alexandre
02761638f1
Avoid conflict with admin labels when importing GitHub labels
2016-09-09 11:22:38 -03:00
Andrew Smith
4a788f8a0c
Only add the original author if there isn't a linked GitLab account
2016-09-08 20:48:35 +10:00
Andrew Smith
9a9e22a88c
Rename `gl_user_id` to `gitlab_user_id` in importer classes
2016-09-08 11:57:22 +10:00
Douwe Maan
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
Felipe Artur
892dea6771
Project tools visibility level
2016-09-01 11:47:59 -03:00
Douglas Barbosa Alexandre
9b376e772e
GitHub importer use default project visibility for non-private projects
2016-08-31 18:27:42 -03:00
Douglas Barbosa Alexandre
80c4f10937
Don't touch Issue/Merge Request when importing GitHub comments
2016-08-31 13:20:28 -03:00
Douglas Barbosa Alexandre
52daddc0b7
Use updated_at as the last updated date when importing from GitHub
2016-08-31 13:20:28 -03:00
Douglas Barbosa Alexandre
2986de7c8c
Add readable error message when remote data could not be fully imported
2016-08-24 12:17:13 -03:00
Douglas Barbosa Alexandre
3c09000e18
Does not halt the GitHub import process when an error occurs
2016-08-24 12:16:42 -03:00
Douglas Barbosa Alexandre
0a1535a9f4
Prefixes removed branches name with PR number when importing PR from GH
2016-08-08 20:24:40 -03:00
Douglas Barbosa Alexandre
167a0c7f0b
Remove SHA suffix for removed branches name when importing PR from GH
2016-08-08 19:39:59 -03:00
Douglas Barbosa Alexandre
1e736fb527
Allow users to import cross-repository pull requests from GitHub
2016-08-04 17:16:50 -03:00
Douglas Barbosa Alexandre
51cf14b37c
Does not need to disable GitHub webhooks since PRs are check out locally
2016-08-04 17:16:50 -03:00
Douglas Barbosa Alexandre
ceff0c9170
Check out locally PRs where the source/target branch were removed
2016-08-04 17:16:50 -03:00
Douglas Barbosa Alexandre
78a5de99e9
Memoize response from `has_rate_limit?` to avoid extra API call
2016-07-12 12:14:17 -03:00
Douglas Barbosa Alexandre
be9262dd95
Checks if rate limit is enabled instead of stubbing response
2016-07-12 12:14:17 -03:00
Douglas Barbosa Alexandre
38a58978aa
Fix GItHub client requests when rate limit is disabled
2016-07-12 12:14:17 -03:00
Douwe Maan
6ce25e7b4c
Rename MergeRequest methods that return commits or shas to be more clear and consistent
2016-07-06 18:50:58 -04:00
Douglas Barbosa Alexandre
5f86a084f2
Consider that a GH exists only if both `ref`, and `sha` exist
2016-07-06 13:08:12 -03:00
Douglas Barbosa Alexandre
4e5de3e6ee
Doesn't trigger Git hooks when cleaning up restored branches from GitHub
2016-07-06 13:08:12 -03:00
Eric K Idema
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
Alejandro Rodríguez
86359ec854
Refactor repository paths handling to allow multiple git mount points
2016-06-29 22:30:31 -04:00
Douglas Barbosa Alexandre
7a34c7997b
Listing GH Webhooks doesn't stop import process for non GH admin users
2016-06-17 18:17:34 -03:00
Douglas Barbosa Alexandre
cef3fd2899
Wrap all rate limiting logic inside GitHub API client
2016-06-09 12:43:06 -03:00
Douglas Barbosa Alexandre
59e5f4705b
Check if GitHub rate limite API was reached before update Webhooks
2016-06-07 10:57:58 -03:00
Douwe Maan
8c5712a422
Merge branch 'gh-disable-webhooks'
2016-06-07 13:06:43 +02:00
Douwe Maan
acef028d85
Merge branch 'gh-fix-comments-on-diff'
2016-06-07 13:04:32 +02:00
Douglas Barbosa Alexandre
67c02edccf
Move create! method from formatters to the BaseFormatter
2016-06-06 14:26:28 -03:00
Douglas Barbosa Alexandre
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
Douglas Barbosa Alexandre
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
Douglas Barbosa Alexandre
659d5d4830
Disable Webhooks before proceeding with the GitHub import
2016-06-06 12:07:45 -03:00
Douglas Barbosa Alexandre
3b4f03de8f
Ensure branch cleanup regardless of whether the import process succeeds
2016-06-02 19:48:11 -03:00
Grzegorz Bizon
86cf9dd253
Enable Lint/LiteralInCondition rubocop cop
...
Checks of literals used in conditions.
See #17478
2016-05-30 12:34:25 +02:00
Douglas Barbosa Alexandre
290aa75e6f
Remove branches that does exist on GitHub after PRs were imported
2016-05-13 17:55:43 -05:00
Douglas Barbosa Alexandre
ebaa19c162
Fix validation method for Gitlab::GithubImport::PullRequestFormatter
2016-05-13 17:55:43 -05:00
Douglas Barbosa Alexandre
795a7ca8f1
Extract GitHub branch formatter
2016-05-13 17:55:42 -05:00
Douglas Barbosa Alexandre
e001bd5e3d
Import PRs where branch names were reused across PRs
2016-05-13 17:55:42 -05:00
Douglas Barbosa Alexandre
7e1f14e215
Preserve commits/diff/comments for PRs that were merged on GitHub
2016-05-13 17:55:42 -05:00
Douglas Barbosa Alexandre
3b50867550
Fix spec for Gitlab::GithubImport::PullRequestFormatter
2016-05-13 16:49:27 -05:00
Douglas Barbosa Alexandre
9b4dc552cb
Import pull requests from GitHub where the target branch was removed
2016-05-13 16:49:27 -05:00
Douglas Barbosa Alexandre
8532dc0d77
Import pull requests from GitHub where the source branch was removed
2016-05-13 16:49:27 -05:00
Douglas Barbosa Alexandre
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
Stan Hu
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
Douglas Barbosa Alexandre
f2fe4af19d
Set GitHub milestones to Issue/Merge Request that were imported
2016-04-18 20:07:05 -03:00
Douglas Barbosa Alexandre
06ec511164
Import milestones from GitHub
2016-04-18 20:07:04 -03:00
Douglas Barbosa Alexandre
7462a8f90a
Apply GitHub labels to Issue/Merge Request that were imported
2016-04-18 17:14:59 -03:00
Douglas Barbosa Alexandre
05a4f444c3
Import labels from GitHub
2016-04-18 17:14:59 -03:00