Merge branch 'master' of https://github.com/terraform-providers/terraform-provider-gitlab

Author: tptee

CHANGELOG.md

@@ -1,20 +1,44 @@
-## 2.8.0 (Unreleased)
+## 2.10.0 (Unreleased)
+## 2.9.0 (June 01, 2020)
 
-* Increase MaxIdleConnsPerHost in http.Transport
-  ([GH-305])
+FEATURES:
+* **New DataSource:** `gitlab_projects`
+  ([#279](https://github.com/terraform-providers/terraform-provider-gitlab/issues/279))
+* **New Resource:** `gitlab_deploy_token`
+  ([#284](https://github.com/terraform-providers/terraform-provider-gitlab/issues/284))
+
+ENHANCEMENTS:
+* Add `management_project_id` for Group and Project Clusters
+  ([#301](https://github.com/terraform-providers/terraform-provider-gitlab/issues/301))
+
+## 2.8.0 (May 28, 2020)
+
+FEATURES:
+* **New Resource:** `gitlab_group_ldap_link`
+  ([#296](https://github.com/terraform-providers/terraform-provider-gitlab/issues/296),
+   [#316](https://github.com/terraform-providers/terraform-provider-gitlab/issues/316))
+
+ENHANCEMENTS:
+
+* Update resource gitlab_group_label to read labels from all pages
+  ([#302](https://github.com/terraform-providers/terraform-provider-gitlab/issues/302))
 * Provide a way to specify client cert and key
-  ([GH-315])
+  ([#315](https://github.com/terraform-providers/terraform-provider-gitlab/issues/315))
+
+BUGFIXES:
+* Increase MaxIdleConnsPerHost in http.Transport
+  ([#305](https://github.com/terraform-providers/terraform-provider-gitlab/issues/305))
 
 ## 2.7.0 (May 20, 2020)
 
 * Implement `masked` parameters for `gitlab_group_variable`
-  ([[#271](https://github.com/terraform-providers/terraform-provider-gitlab/issues/271)])
+  ([#271](https://github.com/terraform-providers/terraform-provider-gitlab/issues/271))
 
 ## 2.6.0 (April 08, 2020)
 
 ENHANCEMENTS:
 * Add jira flags
-  ([[#274](https://github.com/terraform-providers/terraform-provider-gitlab/issues/274)])
+  ([#274](https://github.com/terraform-providers/terraform-provider-gitlab/issues/274))
 
 ## 2.5.1 (April 06, 2020)
 

GNUmakefile

@@ -13,6 +13,12 @@ test: fmtcheck
 	echo $(TEST) | \
 		xargs -t -n4 go test $(TESTARGS) -timeout=30s -parallel=4
 
+testacc-prepareenv:
+	MAKE_TARGET=testacc GITLAB_TOKEN=ACCTEST LC_ALL=en_US sh -c "'$(CURDIR)/scripts/start-gitlab.sh'"
+
+testacc-cleanenv:
+	docker stop gitlab
+
 testacc: fmtcheck
 	TF_ACC=1 go test -v $(TEST) $(TESTARGS) -timeout 40m
 

gitlab/data_source_gitlab_project.go

@@ -107,6 +107,11 @@ func dataSourceGitlabProject() *schema.Resource {
 				Optional: true,
 				Computed: true,
 			},
+			"remove_source_branch_after_merge": {
+				Type:     schema.TypeBool,
+				Optional: true,
+				Computed: true,
+			},
 		},
 	}
 }
@@ -141,5 +146,6 @@ func dataSourceGitlabProjectRead(d *schema.ResourceData, meta interface{}) error
 	d.Set("web_url", found.WebURL)
 	d.Set("runners_token", found.RunnersToken)
 	d.Set("archived", found.Archived)
+	d.Set("remove_source_branch_after_merge", found.RemoveSourceBranchAfterMerge)
 	return nil
 }