Commit Graph

214 Commits

Author SHA1 Message Date
GitLab Bot a22f031743 Add latest changes from gitlab-org/gitlab@master 2020-10-28 03:08:41 +00:00
GitLab Bot 71da5de44f Add latest changes from gitlab-org/gitlab@master 2020-08-05 15:09:59 +00:00
GitLab Bot 86e1f47cd1 Add latest changes from gitlab-org/gitlab@master 2020-06-05 15:08:23 +00:00
GitLab Bot 0d8e625e4c Add latest changes from gitlab-org/gitlab@master 2020-05-25 15:07:58 +00:00
GitLab Bot 0f59ad0c29 Add latest changes from gitlab-org/gitlab@master 2020-04-28 09:09:34 +00:00
GitLab Bot 04baa85554 Add latest changes from gitlab-org/gitlab@master 2020-04-03 09:09:31 +00:00
GitLab Bot 154b9bae14 Add latest changes from gitlab-org/gitlab@master 2020-03-17 21:09:16 +00:00
GitLab Bot 8957ace315 Add latest changes from gitlab-org/gitlab@master 2020-03-14 00:09:30 +00:00
GitLab Bot 85e494935a Add latest changes from gitlab-org/gitlab@master 2020-01-14 15:07:55 +00:00
GitLab Bot 5eb11b697d Add latest changes from gitlab-org/gitlab@master 2020-01-06 18:08:01 +00:00
GitLab Bot d10a462fed Add latest changes from gitlab-org/gitlab@master 2019-12-16 12:07:43 +00:00
GitLab Bot 8cc5f27909 Add latest changes from gitlab-org/gitlab@master 2019-12-13 12:07:41 +00:00
GitLab Bot b570d73ecd Add latest changes from gitlab-org/gitlab@master 2019-11-19 12:06:00 +00:00
GitLab Bot d96abbee0b Add latest changes from gitlab-org/gitlab@master 2019-10-10 15:06:07 +00:00
GitLab Bot 759cd6c298 Add latest changes from gitlab-org/gitlab@master 2019-09-26 09:06:04 +00:00
GitLab Bot d46287cc16 Add latest changes from gitlab-org/gitlab@master 2019-09-20 12:05:52 +00:00
GitLab Bot b7dfe2ae40 Add latest changes from gitlab-org/gitlab@master 2019-09-13 13:26:31 +00:00
dineshpanda e908e11776 Avoid calling freeze on already frozen strings in lib/gitlab 2019-09-04 09:52:02 +05:30
Cindy Pallares 🦉 2b30423935 Add a field for released_at to GH importer 2019-08-09 00:06:21 +00:00
GitLab Release Tools Bot c4bc5dffa4 Merge branch 'security-github-ssrf-redirect' into 'master'
Do not allow localhost url redirection in GitHub Integration

See merge request gitlab/gitlabhq!3188
2019-07-26 13:41:05 +00:00
Mayra Cabrera 0ab89d8e36 Add a rubocop for Rails.logger
Suggests to use a JSON structured log instead

Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/54102
2019-07-10 19:26:47 +00:00
manojmj c93ce83693 Do not allow localhost url redirection in GitHub Integration 2019-07-05 15:09:04 +05:30
Bob Van Landuyt 589b2db06c Setup Phabricator import
This sets up all the basics for importing Phabricator tasks into
GitLab issues.

To import all tasks from a Phabricator instance into GitLab, we'll
import all of them into a new project that will have its repository
disabled.

The import is hooked into a regular ProjectImport setup, but similar
to the GitHub parallel importer takes care of all the imports itself.

In this iteration, we're importing each page of tasks in a separate
sidekiq job.

The first thing we do when requesting a new page of tasks is schedule
the next page to be imported. But to avoid deadlocks, we only allow a
single job per worker type to run at the same time.

For now we're only importing basic Issue information, this should be
extended to richer information.
2019-05-31 09:40:54 +02:00
Felipe Artur c40bad741f Fix issuables state_id nil when importing projects from GitHub
Issues and merge requests imported from GitHub are having state_id
set to null. This fixes the GitHub project importer and schedule
migrations to fix state_id.
2019-05-06 19:45:17 +00:00
Stan Hu f93b2e02a5 Run rubocop -a on CE files 2019-05-05 03:24:28 -07:00
Stan Hu d7c1bed80d GitHub import: Run housekeeping after initial import
After an initial fetch, the repository will have many loose objects
and refs. Running a `git gc` will compact refs into `packed-refs` and
objects into `.pack` files, which should make importing pull
requests faster.

Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/59477
2019-04-07 06:56:49 -07:00
Stan Hu d0336ae88f GitHub importer: Use the project creator to create branches from forks
The project owner may actually be a group, in which case the branch
creation would fail due to a lack of username.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/59396
2019-03-23 07:29:35 -07:00
Kamil Trzciński 98194f1766 Set proper default-branch on GitHub Import 2019-03-22 18:40:50 +00:00
Stan Hu 1e6ea914a1 GitHub import: Create new branches as project owner
This avoids permission errors when importing merge requests whose
authors don't have direct access to push to the main repository.
2019-03-19 11:23:00 -07:00
Diana Stanley 63b89f0485 Protect against nil due_on value in imported data 2019-02-26 12:04:12 -08:00
Diana Stanley d24ea868ab Capture due date when importing milestones from Github 2019-02-20 15:09:27 -08:00
Stan Hu e34a321327 Create the source branch for a GitHub import
When the GitHub importer creates a merge request, it retrieves the SHA
but does not actually create the source branch. This makes it impossible
to merge an open merge request, particularly if the source branch were
from a forked project. In that case, the branch will never exist because
the original `project-name:source-branch` name is never created, nor
is it a valid branch name.

To prevent possible branch name conflicts, forked source branches
are now renamed `github/fork/project-name/source-branch` and created
when necessary.

Note that we only create the source branch if the merge request
is open. For projects that have many merge requests, the project
would end up with a lot of possibly dead branches.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/57370
2019-02-11 22:00:05 -08:00
Stan Hu a9ab6dbc63 Refactor use of Shell.import_repository for Wikis
The previous behavior would pass in a list of parameters
to Shell, but we can improve this by using the WikiFormatter
and Project models to give us the same information.
2019-02-05 21:33:09 -08:00
Stan Hu 82b6e5378a Send project name with Gitaly repository requests
When hashed storage is in use, it's helpful to have the project
name associated with the request.

Closes https://gitlab.com/gitlab-org/gitaly/issues/1394
2019-02-05 21:33:09 -08:00
Francisco Javier López b3c13bbb3c
Added validations to prevent LFS object forgery 2019-01-31 16:51:54 +01:00
Andreas Brandl 820739eb09
Revert "Trigger iid logic from GitHub importer for issues."
This reverts commit b78a69b06c.
2019-01-29 15:38:40 +01:00
Andreas Brandl 852e68fd95
Revert "Trigger iid logic from GitHub importer for milestones."
This reverts commit 358675d09f.
2019-01-29 15:38:40 +01:00
Tiago Botelho 4bd8a427d4
Removes all the irrelevant import related code and columns
Clears the import related columns and code from the Project
model over to the ProjectImportState model
2018-11-27 12:58:13 +00:00
Yorick Peterse 2039c8280d
Disable existing offenses for the CodeReuse cops
This whitelists all existing offenses for the various CodeReuse cops, of
which most are triggered by the CodeReuse/ActiveRecord cop.
2018-09-11 17:32:00 +02:00
Jacopo c6bddeacf4 Updates code using class_methods over module ClassMethods 2018-08-29 16:56:34 +02:00
Stan Hu 0377c015cf Refactor GitHub Importer database helpers into helper methods
This in preparation for addressing idle-in-transaction timeouts for other importers.

Part of #50021
2018-08-24 05:34:38 -07:00
Yorick Peterse 6f3c490107
Refactor AutocompleteController
This refactors the AutocompleteController according to the guidelines
and boundaries discussed in
https://gitlab.com/gitlab-org/gitlab-ce/issues/49653. Specifically,
ActiveRecord logic is moved to different finders, which are then used in
the controller. View logic in turn is moved to presenters, instead of
directly using ActiveRecord's "to_json" method.

The finder MoveToProjectFinder is also adjusted according to the
abstraction guidelines and boundaries, resulting in a much more simple
finder.

By using finders (and other abstractions) more actively, we can push a
lot of logic out of the controller. We also remove the need for various
"before_action" hooks, though this could be achieved without using
finders as well.

The various finders related to AutcompleteController have also been
moved into a namespace. This removes the need for calling everything
"AutocompleteSmurfFinder", instead you can use
"Autocomplete::SmurfFinder".
2018-08-20 13:53:00 +02:00
Andreas Brandl fb98496f49
Trigger iid logic from GitHub importer for merge requests. 2018-08-16 10:01:02 +02:00
Andreas Brandl 358675d09f
Trigger iid logic from GitHub importer for milestones. 2018-08-16 10:01:02 +02:00
Andreas Brandl b78a69b06c
Trigger iid logic from GitHub importer for issues. 2018-08-16 10:01:02 +02:00
Yorick Peterse 9e29408ee6
Don't expose project names in various counters
Various counters would expose either project names, or full project
paths (e.g. "gitlab-org/gitlab-ce"). This commit changes various places
where we use "add_event" so we no longer expose (potentially) private
information.
2018-06-21 16:56:40 +02:00
Lin Jen-Shin c61392b4e4 Bring changes from EE for parallel_importer.rb 2018-06-14 02:05:01 +08:00
Yorick Peterse e4612df0e2
Ensure MR diffs always exist in the PR importer
In rare cases it could happen that an MR was created, but creating the
MR diffs somehow failed (e.g. due to an error). This commit adds an
additional check to make sure MR diffs are always present when importing
GitHub pull requests.
2018-06-12 13:30:41 +02:00
Stan Hu 6defeb0a7d Expire Wiki content cache after importing a repository
The cache state for Wikis that were imported via GitHub or Bitbucket does
not appear to have been flushed after a successful import.

Closes #47546
2018-06-11 08:33:06 -07:00
Francisco Javier López e8f49b4bee Support LFS objects when creating a project by import 2018-06-06 16:42:18 +00:00