Commit graph

14 commits

Author SHA1 Message Date
GitLab Bot
b58ab6c33c Add latest changes from gitlab-org/gitlab@master 2020-10-16 18:09:04 +00:00
GitLab Bot
41e8b05e8d Add latest changes from gitlab-org/gitlab@master 2020-05-13 12:07:54 +00:00
GitLab Bot
fdd0b0fd45 Add latest changes from gitlab-org/gitlab@master 2020-04-23 18:09:46 +00:00
GitLab Bot
b7dfe2ae40 Add latest changes from gitlab-org/gitlab@master 2019-09-13 13:26:31 +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
James Lopez
07009a1f48
Add Object Storage to GitLab project import
- Refactor uploads manager
- Refactor importer, update import spec
- Add more object storage specs
2018-08-02 11:50:19 +02:00
Francisco Javier López
38eab74483
EE Port 2018-07-20 19:25:10 -04:00
gfyoung
fbde835404 Enable more frozen string in app/services/**/*.rb
Partially addresses #47424.
2018-07-17 15:19:40 -07:00
Francisco Javier López
f20912df03 Extend API for importing a project export with overwrite support 2018-04-06 15:23:49 +00:00
Bob Van Landuyt
e40c0085ef Store override params as import data on projects
This means import data doesn't necessarily have to have an import_url
anymore.

The `ProjectImportData` could just contain the override data in it's
serialized data attribute.

The import data is automatically cleaned up after it is finished by
the state machine.
2018-04-04 19:49:48 +02:00
George Tsiolis
ca5b4e3de2 Update projects import service
- Remove Gitlab::ImportExport::ProjectCreator from GitlabProjectsImportService
- Override ::Projects::CreateService params
2018-02-12 17:45:12 +02:00
Stan Hu
1f96512ba1 Merge branch 'sh-validate-path-project-import-10-3' into 'security-10-3'
Validate project path in Gitlab import - 10.3 port

See merge request gitlab/gitlabhq!2268

(cherry picked from commit 94c82376d66fc80d46dd2d5eeb5bade408ec6a7e)

2b94a7c2 Validate project path in Gitlab import
2018-01-16 17:04:38 -08:00
Tiago Botelho
aae947cb1c
Fixes race condition in project uploads
Originally picked as: 3fc0dbcbebcd470fe14f8b5fb7ad55dc3912402e. But
given the internals changed, this was changed now. The changelog was
removed too.
2017-08-07 14:31:45 +02:00
Z.J. van de Weg
3baf3dc955
Rename GitLabProjectImporterService and misc fixes
First round of review, main changes:
- templates.title is human readable, #name will be passed around
- GitLabProjectImporterService has been renamed
2017-08-01 14:36:42 +02:00
Renamed from app/services/projects/gitlab_projects_importer_service.rb (Browse further)