diff options
author | Balasankar "Balu" C <balasankar@gitlab.com> | 2019-02-18 19:47:29 +0530 |
---|---|---|
committer | Balasankar "Balu" C <balasankar@gitlab.com> | 2019-02-20 00:19:27 +0530 |
commit | 39f77ad9b46d78908531a303e8a237b40fd07e7e (patch) | |
tree | e150a5983595d0b415c6324e81fe7fd8bf8efeb7 | |
parent | ab9f8785ebf5483e5d2cd02497b57fa05a47561e (diff) | |
download | gitlab-ce-39f77ad9b46d78908531a303e8a237b40fd07e7e.tar.gz |
Let users set name/path on project fork using API
-rw-r--r-- | app/services/projects/fork_service.rb | 12 | ||||
-rw-r--r-- | changelogs/unreleased/40795-set-project-name-on-fork-api.yml | 5 | ||||
-rw-r--r-- | doc/api/projects.md | 2 | ||||
-rw-r--r-- | lib/api/projects.rb | 2 |
4 files changed, 19 insertions, 2 deletions
diff --git a/app/services/projects/fork_service.rb b/app/services/projects/fork_service.rb index 91091c4393d..fc234bafc57 100644 --- a/app/services/projects/fork_service.rb +++ b/app/services/projects/fork_service.rb @@ -38,8 +38,8 @@ module Projects new_params = { visibility_level: allowed_visibility_level, description: @project.description, - name: @project.name, - path: @project.path, + name: target_name, + path: target_path, shared_runners_enabled: @project.shared_runners_enabled, namespace_id: target_namespace.id, fork_network: fork_network, @@ -94,6 +94,14 @@ module Projects Projects::ForksCountService.new(@project).refresh_cache end + def target_path + @target_path ||= @params[:path] || @project.path + end + + def target_name + @target_name ||= @params[:name] || @project.name + end + def target_namespace @target_namespace ||= @params[:namespace] || current_user.namespace end diff --git a/changelogs/unreleased/40795-set-project-name-on-fork-api.yml b/changelogs/unreleased/40795-set-project-name-on-fork-api.yml new file mode 100644 index 00000000000..742184bbe1e --- /dev/null +++ b/changelogs/unreleased/40795-set-project-name-on-fork-api.yml @@ -0,0 +1,5 @@ +--- +title: Add ability to set path and name for project on fork using API +merge_request: 25363 +author: +type: added diff --git a/doc/api/projects.md b/doc/api/projects.md index 3c0c956ddc2..0a950352ecf 100644 --- a/doc/api/projects.md +++ b/doc/api/projects.md @@ -771,6 +771,8 @@ POST /projects/:id/fork | --------- | ---- | -------- | ----------- | | `id` | integer/string | yes | The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding) | | `namespace` | integer/string | yes | The ID or path of the namespace that the project will be forked to | +| `path` | string | no | The path that will be assigned to the resultant project after forking | +| `name` | string | no | The name that will be assigned to the resultant project after forking | ## List Forks of a project diff --git a/lib/api/projects.rb b/lib/api/projects.rb index 6a93ef9f3ad..bd5678f513f 100644 --- a/lib/api/projects.rb +++ b/lib/api/projects.rb @@ -258,6 +258,8 @@ module API end params do optional :namespace, type: String, desc: 'The ID or name of the namespace that the project will be forked into' + optional :path, type: String, desc: 'The path that will be assigned to the fork' + optional :name, type: String, desc: 'The name that will be assigned to the fork' end post ':id/fork' do Gitlab::QueryLimiting.whitelist('https://gitlab.com/gitlab-org/gitlab-ce/issues/42284') |