diff --git a/.github/workflows/docker_build.yml b/.github/workflows/docker_build.yml index d1ecad671..f5403695c 100644 --- a/.github/workflows/docker_build.yml +++ b/.github/workflows/docker_build.yml @@ -8,4 +8,4 @@ on: types: [checks_requested] jobs: build-image: - uses: alphagov/forms-deploy/.github/workflows/reusable-build-image.yml@main + uses: govuk-forms/forms-deploy/.github/workflows/reusable-build-image.yml@main diff --git a/.github/workflows/lint-workflows.yml b/.github/workflows/lint-workflows.yml index f55a7be6e..2337fd3cd 100644 --- a/.github/workflows/lint-workflows.yml +++ b/.github/workflows/lint-workflows.yml @@ -9,4 +9,4 @@ on: jobs: lint-workflows: - uses: alphagov/forms-deploy/.github/workflows/reusable-lint-workflows.yml@main + uses: govuk-forms/forms-deploy/.github/workflows/reusable-lint-workflows.yml@main diff --git a/.github/workflows/require-pinned-github-actions.yml b/.github/workflows/require-pinned-github-actions.yml index 791f6aa82..010396e52 100644 --- a/.github/workflows/require-pinned-github-actions.yml +++ b/.github/workflows/require-pinned-github-actions.yml @@ -8,4 +8,4 @@ on: jobs: check-actions-sha: name: Check actions are pinned to SHAs - uses: alphagov/forms-deploy/.github/workflows/require-pinned-github-actions.yml@main + uses: govuk-forms/forms-deploy/.github/workflows/require-pinned-github-actions.yml@main diff --git a/.github/workflows/review_apps_on_pr_change.yml b/.github/workflows/review_apps_on_pr_change.yml index 5d58d49a7..91a89fa5c 100644 --- a/.github/workflows/review_apps_on_pr_change.yml +++ b/.github/workflows/review_apps_on_pr_change.yml @@ -15,6 +15,6 @@ permissions: jobs: update-review-app: name: Update review app - uses: alphagov/forms-deploy/.github/workflows/reusable-review_apps_on_pr_change.yml@main + uses: govuk-forms/forms-deploy/.github/workflows/reusable-review_apps_on_pr_change.yml@main with: app-name: forms-admin diff --git a/.github/workflows/review_apps_on_pr_close.yml b/.github/workflows/review_apps_on_pr_close.yml index f73baf21e..f2ad31f22 100644 --- a/.github/workflows/review_apps_on_pr_close.yml +++ b/.github/workflows/review_apps_on_pr_close.yml @@ -15,6 +15,6 @@ permissions: jobs: delete-review-app: name: Delete review app - uses: alphagov/forms-deploy/.github/workflows/reusable-review_apps_on_pr_close.yml@main + uses: govuk-forms/forms-deploy/.github/workflows/reusable-review_apps_on_pr_close.yml@main with: app-name: forms-admin diff --git a/.github/workflows/trello_poster.yml b/.github/workflows/trello_poster.yml index 7fca07124..34a6dde17 100644 --- a/.github/workflows/trello_poster.yml +++ b/.github/workflows/trello_poster.yml @@ -4,7 +4,7 @@ on: types: [opened, edited] jobs: trello-poster: - uses: alphagov/forms-deploy/.github/workflows/trello-poster.yml@main + uses: govuk-forms/forms-deploy/.github/workflows/trello-poster.yml@main secrets: TRELLO_API_TOKEN: ${{ secrets.TRELLO_API_TOKEN }} TRELLO_API_KEY: ${{ secrets.TRELLO_API_KEY }} diff --git a/.review_apps/site.tf b/.review_apps/site.tf index 74c9412d3..bb566f31a 100644 --- a/.review_apps/site.tf +++ b/.review_apps/site.tf @@ -28,8 +28,8 @@ provider "aws" { default_tags { tags = { Environment = "review" - Deployment = "github.com/alphagov/forms-admin/.review_apps" - PullRequest = "https://github.com/alphagov/forms-admin/pull/${var.pull_request_number}" + Deployment = "github.com/govuk-forms/forms-admin/.review_apps" + PullRequest = "https://github.com/govuk-forms/forms-admin/pull/${var.pull_request_number}" } } } diff --git a/Gemfile b/Gemfile index 226c826a7..5d3fc9094 100644 --- a/Gemfile +++ b/Gemfile @@ -49,7 +49,7 @@ gem "govuk_design_system_formbuilder", "~> 6" gem "dfe-autocomplete", require: "dfe/autocomplete", github: "DFE-Digital/dfe-autocomplete", ref: "1d4cc65039e11cc3ba9e7217a719b8128d0e4d53" # Our own custom markdown renderer -gem "govuk-forms-markdown", require: "govuk_forms_markdown", github: "alphagov/govuk-forms-markdown", tag: "0.8.0" +gem "govuk-forms-markdown", require: "govuk_forms_markdown", github: "govuk-forms/govuk-forms-markdown", tag: "0.8.0" # For structured logging gem "lograge" diff --git a/README.md b/README.md index 1d927c828..6b96ab13c 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# GOV.UK Forms Admin [![Tests](https://github.com/alphagov/forms-admin/actions/workflows/test.yml/badge.svg)](https://github.com/alphagov/forms-admin/actions/workflows/test.yml) +# GOV.UK Forms Admin [![Tests](https://github.com/govuk-forms/forms-admin/actions/workflows/test.yml/badge.svg)](https://github.com/govuk-forms/forms-admin/actions/workflows/test.yml) GOV.UK Forms is a service for creating forms. GOV.UK Forms Admin is a an application to handle the administration, design and publishing of those forms. It's a Ruby on Rails application built on a PostgreSQL database. @@ -22,7 +22,7 @@ We recommend using a version manager to install and manage these, such as: ```bash # 1. Clone the git repository and change directory to the new folder -git clone git@github.com:alphagov/forms-admin.git +git clone git@github.com:govuk-forms/forms-admin.git cd forms-admin # 2. Run the setup script @@ -242,7 +242,7 @@ If you want to deliberately raise an exception to test, uncomment out the trigge The forms-admin app is containerised (see [Dockerfile](Dockerfile)) and can be deployed however you would normally deploy a containerised app. -We host our apps using Amazon Web Services (AWS). You can [read about how deployments happen on our team wiki, if you have access](https://github.com/alphagov/forms-team/wiki/Deploying-code-changes-in-AWS). +We host our apps using Amazon Web Services (AWS). You can [read about how deployments happen on our team wiki, if you have access](https://github.com/govuk-forms/forms-team/wiki/Deploying-code-changes-in-AWS). ### Logging @@ -252,7 +252,7 @@ We host our apps using Amazon Web Services (AWS). You can [read about how deploy ### Updating Docker files -To update the version of [Alpine Linux] and Ruby used in the Dockerfile, use the [update_app_versions.sh script in forms-deploy](https://github.com/alphagov/forms-deploy/blob/main/support/update_app_versions.sh) +To update the version of [Alpine Linux] and Ruby used in the Dockerfile, use the [update_app_versions.sh script in forms-deploy](https://github.com/govuk-forms/forms-deploy/blob/main/support/update_app_versions.sh) [Alpine Linux]: https://www.alpinelinux.org/ diff --git a/lib/tasks/deploy.rake b/lib/tasks/deploy.rake index cdac3e13d..b75bec9e0 100644 --- a/lib/tasks/deploy.rake +++ b/lib/tasks/deploy.rake @@ -14,7 +14,7 @@ namespace :pipeline do puts "Will use Git commit: #{git_hash}" puts "Checking commit has been pushed..." - resp = Net::HTTP.get_response URI("https://api.github.com/repos/alphagov/forms-admin/commits/#{git_hash}") + resp = Net::HTTP.get_response URI("https://api.github.com/repos/govuk-forms/forms-admin/commits/#{git_hash}") if resp.code != "200" puts "Commit has not been pushed. The pipelines will not be able to find it." puts "Push the commit and run the command again."