From cfa15d0846e43b72d91ec83384c8d1cefcd1c80c Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Wed, 6 Nov 2013 19:14:11 +0200
Subject: [PATCH] Remove default_branch support from API project creation
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
doc/api/projects.md | 1 -
lib/api/projects.rb | 2 --
spec/requests/api/projects_spec.rb | 5 -----
3 files changed, 8 deletions(-)
diff --git a/doc/api/projects.md b/doc/api/projects.md
index 3ae9af59fc3..d4d883e54ec 100644
--- a/doc/api/projects.md
+++ b/doc/api/projects.md
@@ -213,7 +213,6 @@ Parameters:
+ `name` (required) - new project name
+ `description` (optional) - short project description
-+ `default_branch` (optional) - 'master' by default
+ `issues_enabled` (optional)
+ `wall_enabled` (optional)
+ `merge_requests_enabled` (optional)
diff --git a/lib/api/projects.rb b/lib/api/projects.rb
index 221f1f1e23c..42560572046 100644
--- a/lib/api/projects.rb
+++ b/lib/api/projects.rb
@@ -60,7 +60,6 @@ module API
# Parameters:
# name (required) - name for new project
# description (optional) - short project description
- # default_branch (optional) - 'master' by default
# issues_enabled (optional)
# wall_enabled (optional)
# merge_requests_enabled (optional)
@@ -75,7 +74,6 @@ module API
attrs = attributes_for_keys [:name,
:path,
:description,
- :default_branch,
:issues_enabled,
:wall_enabled,
:merge_requests_enabled,
diff --git a/spec/requests/api/projects_spec.rb b/spec/requests/api/projects_spec.rb
index bf4a1749418..2ae186b967a 100644
--- a/spec/requests/api/projects_spec.rb
+++ b/spec/requests/api/projects_spec.rb
@@ -91,7 +91,6 @@ describe API::API do
it "should assign attributes to project" do
project = attributes_for(:project, {
description: Faker::Lorem.sentence,
- default_branch: 'stable',
issues_enabled: false,
wall_enabled: false,
merge_requests_enabled: false,
@@ -110,16 +109,13 @@ describe API::API do
project = attributes_for(:project, { public: true })
post api("/projects", user), project
json_response['public'].should be_true
-
end
it "should set a project as private" do
project = attributes_for(:project, { public: false })
post api("/projects", user), project
json_response['public'].should be_false
-
end
-
end
describe "POST /projects/user/:id" do
@@ -146,7 +142,6 @@ describe API::API do
it "should assign attributes to project" do
project = attributes_for(:project, {
description: Faker::Lorem.sentence,
- default_branch: 'stable',
issues_enabled: false,
wall_enabled: false,
merge_requests_enabled: false,
--
GitLab