Skip to content

Adding merge types to repository resource#1

Merged
stack72 merged 1 commit intointegrations:masterfrom
taiidani:GitHubMergeTypes
Jun 16, 2017
Merged

Adding merge types to repository resource#1
stack72 merged 1 commit intointegrations:masterfrom
taiidani:GitHubMergeTypes

Conversation

@taiidani
Copy link
Copy Markdown

@taiidani taiidani commented Jun 9, 2017 •
edited
Loading

Adding merge types to the GitHub Repository resource so that users can control when the repository allows Squash merges, Rebase merges and/or Merge commits.

Imported from hashicorp/terraform#15230
Fixes hashicorp/terraform#15183
Fixes #14

@taiidani taiidani mentioned this pull request Jun 9, 2017
Closed
@apparentlymart apparentlymart added the Type: Feature New feature or request label Jun 12, 2017
@josephholsten
Copy link
Copy Markdown

josephholsten commented Jun 13, 2017

sans whitespace: https://github.com/terraform-providers/terraform-provider-github/pull/1/files?w=1

josephholsten
josephholsten approved these changes Jun 13, 2017
View reviewed changes
Copy link
Copy Markdown

@josephholsten josephholsten left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems boring an reasonable!

@taiidani
Copy link
Copy Markdown
Author

taiidani commented Jun 14, 2017

Hey -- boring? This was my first contribution to Terraform! Far from boring!

@josephholsten
Copy link
Copy Markdown

josephholsten commented Jun 14, 2017

"Exciting" code scares me. I'll take boring any day!

I think we're waiting on the provider migration to finish and then this can get merged.

@stack72
Copy link
Copy Markdown
Contributor

stack72 commented Jun 16, 2017

Hi @taiidani

Thanks for the work here - I had to make 1 change to the tests. When i ran the tests in their form, I got the following:

=== RUN   TestAccGithubRepository_importBasic
--- FAIL: TestAccGithubRepository_importBasic (0.32s)
	testing.go:428: Step 0 error: Error applying: 1 error(s) occurred:

		* github_repository.foo: 1 error(s) occurred:

		* github_repository.foo: POST https://api.github.com/orgs/terraformtesting/repos: 422 Repository creation failed. [{Resource:Repository Field: Code:custom Message:Either :allow_merge_commit, :allow_squash_merge or :allow_rebase_merge must be true}]

So I updated the tests :)

Thanks

Paul

@stack72 stack72 merged commit 1bbe0ed into integrations:master Jun 16, 2017
@ghost ghost mentioned this pull request Jun 28, 2017
Closed
@anGie44 anGie44 mentioned this pull request Apr 3, 2020
Closed
frbayart added a commit to frbayart/terraform-provider-github that referenced this pull request Dec 6, 2020
@frbayart
Added allowsDeletionsand allowsForcePushessettings https://develo…
cad2db0 
…per.github.com/v4/changelog/2020-11-13-schema-changes/ (integrations#1)
jcudit pushed a commit that referenced this pull request Dec 18, 2020
@frbayart
Added allowsDeletionsand allowsForcePushessettings (#623)
8927341 
* Added `allowsDeletions`and `allowsForcePushes`settings https://developer.github.com/v4/changelog/2020-11-13-schema-changes/ (#1)

* complete documentation

* update module github.com/shurcooL/githubv4 with `go get github.com/shurcooL/githubv4`

* vendor latest githubv4

* add test for deletions and force pushes

Co-authored-by: Jeremy Udit <jcudit@github.com>
This was referenced Jun 16, 2023
Open
Open
This was referenced Aug 15, 2023
Closed
Closed
@renovate renovate bot mentioned this pull request Sep 29, 2023
Closed
1 task
avidspartan1 pushed a commit to avidspartan1/terraform-provider-github that referenced this pull request Feb 5, 2024
@frbayart
Added allowsDeletionsand allowsForcePushessettings (integrations#623
bf3de71 
)

* Added `allowsDeletions`and `allowsForcePushes`settings https://developer.github.com/v4/changelog/2020-11-13-schema-changes/ (integrations#1)

* complete documentation

* update module github.com/shurcooL/githubv4 with `go get github.com/shurcooL/githubv4`

* vendor latest githubv4

* add test for deletions and force pushes

Co-authored-by: Jeremy Udit <jcudit@github.com>
kfcampbell pushed a commit that referenced this pull request Mar 8, 2024
@ErikElkins
feat: Add github_actions_enterprise_permissions (#2155)
52e1853 
* Adding github_actions_enterprise_permissions (#1)

* Adding enterprise permissions resource

* Working version

* Adding docs

* Functioning tests

* Adding check on integration tests

* Switching to github_enterprise_actions_permissions
@pleo-bot-renovate pleo-bot-renovate mentioned this pull request Mar 15, 2024
Closed
1 task
@renovate renovate bot mentioned this pull request Aug 2, 2025
Open
1 task
@pete-woods pete-woods mentioned this pull request Nov 29, 2025
Merged
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@josephholsten josephholsten josephholsten approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

Type: Feature New feature or request

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@taiidani @josephholsten @stack72 @apparentlymart