Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/docker_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion .github/workflows/lint-workflows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion .github/workflows/require-pinned-github-actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion .github/workflows/review_apps_on_pr_change.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion .github/workflows/review_apps_on_pr_close.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion .github/workflows/trello_poster.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
4 changes: 2 additions & 2 deletions .review_apps/site.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
}
}
}
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -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.

Expand All @@ -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
Expand Down Expand Up @@ -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

Expand All @@ -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/

Expand Down
2 changes: 1 addition & 1 deletion lib/tasks/deploy.rake
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
Loading