Commit Graph

54 Commits

Author SHA1 Message Date
GitLab Bot 5fe2d74e00 Add latest changes from gitlab-org/gitlab@master 2022-12-09 09:08:55 +00:00
GitLab Bot d88cacce3f Add latest changes from gitlab-org/gitlab@master 2022-11-30 21:08:01 +00:00
GitLab Bot e778dcbcee Add latest changes from gitlab-org/gitlab@master 2022-11-24 15:07:34 +00:00
GitLab Bot 8fa0c53e26 Add latest changes from gitlab-org/gitlab@master 2022-11-16 18:11:26 +00:00
GitLab Bot 37a739daec Add latest changes from gitlab-org/gitlab@master 2022-09-13 12:12:50 +00:00
GitLab Bot 8ec882085e Add latest changes from gitlab-org/gitlab@master 2022-08-05 15:12:12 +00:00
GitLab Bot 205b6baf26 Add latest changes from gitlab-org/gitlab@master 2022-07-05 15:08:48 +00:00
GitLab Bot 9b762f50fe Add latest changes from gitlab-org/gitlab@master 2022-04-14 15:08:59 +00:00
GitLab Bot 4001deba73 Add latest changes from gitlab-org/gitlab@master 2022-04-05 15:08:37 +00:00
GitLab Bot 48deaeec94 Add latest changes from gitlab-org/gitlab@master 2022-03-18 18:07:26 +00:00
GitLab Bot bbfe48cb82 Add latest changes from gitlab-org/gitlab@master 2022-03-09 09:08:34 +00:00
GitLab Bot 0ead22f9db Add latest changes from gitlab-org/gitlab@master 2022-03-07 06:15:33 +00:00
GitLab Bot ec6dd14345 Add latest changes from gitlab-org/gitlab@master 2021-12-07 00:14:07 +00:00
GitLab Bot 844eb8879a Add latest changes from gitlab-org/gitlab@master 2021-11-24 18:14:31 +00:00
GitLab Bot 6fd750c192 Add latest changes from gitlab-org/gitlab@master 2021-11-10 18:12:35 +00:00
GitLab Bot b267f3a3ac Add latest changes from gitlab-org/gitlab@master 2021-10-28 18:14:18 +00:00
GitLab Bot d1fd19e525 Add latest changes from gitlab-org/gitlab@master 2021-05-05 21:09:59 +00:00
GitLab Bot 6d18e2830d Add latest changes from gitlab-org/gitlab@master 2021-04-05 18:09:15 +00:00
GitLab Bot ced6c9ae9a Add latest changes from gitlab-org/gitlab@master 2021-02-11 00:08:50 +00:00
GitLab Bot 1bdf79827c Add latest changes from gitlab-org/gitlab@master 2020-12-02 15:09:37 +00:00
GitLab Bot fa7ac2663b Add latest changes from gitlab-org/gitlab@master 2020-06-24 06:09:01 +00:00
GitLab Bot 00fa950a34 Add latest changes from gitlab-org/gitlab@master 2020-03-13 18:09:39 +00:00
GitLab Bot c77fda905a Add latest changes from gitlab-org/gitlab@master 2020-02-27 21:09:17 +00:00
GitLab Bot c72e5ebe99 Add latest changes from gitlab-org/gitlab@master 2020-02-27 09:09:01 +00:00
GitLab Bot c8e28a0bb8 Add latest changes from gitlab-org/gitlab@master 2020-01-27 09:08:32 +00:00
GitLab Bot e723867717 Add latest changes from gitlab-org/gitlab@master 2019-12-17 18:07:48 +00:00
GitLab Bot abfafe3c57 Add latest changes from gitlab-org/gitlab@master 2019-10-29 00:06:10 +00:00
GitLab Bot b3e4ec8e8a Add latest changes from gitlab-org/gitlab@master 2019-10-23 09:06:03 +00:00
GitLab Bot fc8c74fd0c Add latest changes from gitlab-org/gitlab@master 2019-09-20 00:05:59 +00:00
blackst0ne b44a2c801a Update specs to rails5 format
Updates specs to use new rails5 format.

The old format:
`get :show, { some: params }, { some: headers }`

The new format:
`get :show, params: { some: params }, headers: { some: headers }`
2018-12-19 10:04:31 +11: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
James Lopez a2aa505805
Refactor code to remove object storage flag from Import/Export
Updated docs, refactor import/export code
Fix AvatarUploader path issue
Fix project export upload webhook error
2018-09-06 16:52:42 +02:00
sliaquat 4157073068 Remove some duplicate tests and fix some typos 2018-08-16 16:40:03 +05: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
blackst0ne ddd2a25679 Replace 'Sidekiq::Testing.inline!' with 'perform_enqueued_jobs'
`perform_enqueued_jobs` is a Sidekiq method.
Using this method violates the Dependency inversion principle[0].

This commit replaces `perform_enqueued_jobs` with ActiveJob's abstract
method `perform_enqueued_jobs` in specs.

[0]: https://en.wikipedia.org/wiki/Dependency_inversion_principle
2018-07-23 15:34:54 +11:00
Mark Chao a63bce1a4b Resolve "Rename the `Master` role to `Maintainer`" Backend 2018-07-11 14:36:08 +00:00
Lin Jen-Shin 4ee08b77bc Updates from `rubocop -a` 2018-07-09 21:13:08 +08:00
Robert Speicher b38c75b3dc Correct more usages of non-relative `fixture_file_upload` paths 2018-06-07 09:54:41 -05:00
Tiago Botelho bddbcaefc2 Backports every CE related change from ee-44542 to CE 2018-05-04 17:33:26 +02: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 e3acc982a8 Override values from JSON with import data
This overrides values defined in the project JSON with the values
provided in project.import_data.data['override_params'].

These could be passed from the API.
2018-04-05 09:18:12 +02: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
James Lopez d8dfec0ffa
Fix project import API after import service refactor 2018-02-16 18:03:34 +01:00
James Lopez 2dc2bad623
refactor code based on feedback 2018-02-14 14:55:11 +01:00
James Lopez e613d777b2
refactor code based on feedback 2018-02-14 14:46:40 +01:00
James Lopez de83f29a35
add more specs 2018-02-13 15:25:49 +01:00
James Lopez 79879145e5
add more specs 2018-02-13 15:25:49 +01:00
James Lopez 583ed0eb94
add import status endpoint 2018-02-13 15:25:48 +01:00
James Lopez 7ec1a022b7
fix file upload 2018-02-13 15:25:48 +01:00
James Lopez 516d33f5ac
update import API and spec 2018-02-13 15:25:48 +01:00