summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-12-22 17:09:48 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-12-22 17:09:48 +0200
commitfb7be3238d86501353863313af72563528ace76f (patch)
tree348a800410bfb87639244794891db811fb88d8be
parentd0b1bc222e7486bcb4877a7b8526b1646c2be0fc (diff)
downloadgitlab-ce-fb7be3238d86501353863313af72563528ace76f.tar.gz
For API compatibility still generate path from name if only name provided
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-rw-r--r--app/services/projects/create_service.rb9
1 files changed, 8 insertions, 1 deletions
diff --git a/app/services/projects/create_service.rb b/app/services/projects/create_service.rb
index 7b06ce9a337..31226b7504b 100644
--- a/app/services/projects/create_service.rb
+++ b/app/services/projects/create_service.rb
@@ -13,8 +13,15 @@ module Projects
end
# Set project name from path
- unless @project.name.present?
+ if @project.name.present? && @project.path.present?
+ # if both name and path set - everything is ok
+ elsif @project.path.present?
+ # Set project name from path
@project.name = @project.path.dup
+ elsif @project.name.present?
+ # For compatibility - set path from name
+ # TODO: remove this in 8.0
+ @project.path = @project.name.dup.parameterize
end
# get namespace id