summaryrefslogtreecommitdiff
path: root/app/contexts
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-07-04 14:32:02 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-07-04 14:32:02 +0300
commit5f0b50db7aaa3d10bf2b49d5fb7ca55d6f3ccd10 (patch)
tree35e65d9a84fcf15b5e277c5a403bc10007029e9e /app/contexts
parent44ac961b8d7e07f794330b6e527c50b437923fb5 (diff)
downloadgitlab-ce-5f0b50db7aaa3d10bf2b49d5fb7ca55d6f3ccd10.tar.gz
Discover default branch on project creationg
Diffstat (limited to 'app/contexts')
-rw-r--r--app/contexts/projects/create_context.rb9
1 files changed, 7 insertions, 2 deletions
diff --git a/app/contexts/projects/create_context.rb b/app/contexts/projects/create_context.rb
index a8c8effa79e..aee3c1c566c 100644
--- a/app/contexts/projects/create_context.rb
+++ b/app/contexts/projects/create_context.rb
@@ -48,6 +48,7 @@ module Projects
# Import project from cloneable resource
if @project.valid? && @project.import_url.present?
shell = Gitlab::Shell.new
+
if shell.import_repository(@project.path_with_namespace, @project.import_url)
# We should create satellite for imported repo
@project.satellite.create unless @project.satellite.exists?
@@ -58,8 +59,12 @@ module Projects
end
end
- if @project.save && !@project.group
- @project.users_projects.create(project_access: UsersProject::MASTER, user: current_user)
+ if @project.save
+ unless @project.group
+ @project.users_projects.create(project_access: UsersProject::MASTER, user: current_user)
+ end
+
+ @project.discover_default_branch
end
@project