Skip to content
Merged
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
4 changes: 2 additions & 2 deletions .github/workflows/prepare-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,9 @@ jobs:
id: create-pull-request
uses: peter-evans/create-pull-request@67ccf781d68cd99b580ae25a5c18a1cc84ffff1f # v7.0.6
with:
author: weave-gitops-bot <weave-gitops-bot@weave.works>
author: weave-gitops-bot <weave-gitops-bot@weaveworks.org>
signoff: true
committer: weave-gitops-bot <weave-gitops-bot@weave.works>
committer: weave-gitops-bot <weave-gitops-bot@weaveworks.org>
branch: ${{ env.BRANCH }}
base: main
title: "Updates for ${{ env.GITOPS_VERSION }}"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
- name: Set tag
run: |
git config user.name weave-gitops-bot
git config user.email weave-gitops-bot@weave.works
git config user.email weave-gitops-bot@weaveworks.org
git tag -a ${{ steps.release-version.outputs.version }} -m ${{ steps.release-version.outputs.version }}
git push origin tag ${{ steps.release-version.outputs.version }}

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/upgrade-flux.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ jobs:
- name: Create Pull Request
uses: peter-evans/create-pull-request@67ccf781d68cd99b580ae25a5c18a1cc84ffff1f # v7.0.6
with:
author: weave-gitops-bot <weave-gitops-bot@weave.works>
author: weave-gitops-bot <weave-gitops-bot@weaveworks.org>
signoff: true
committer: weave-gitops-bot <weave-gitops-bot@weave.works>
committer: weave-gitops-bot <weave-gitops-bot@weaveworks.org>
branch: upgrade-flux
base: main
title: "Upgrade flux to ${{ needs.has-new-flux.outputs.version }}"
Expand Down
2 changes: 1 addition & 1 deletion .goreleaser.brew.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ brews:
name: homebrew-tap
commit_author:
name: weave-gitops-bot
email: weave-gitops-bot@weave.works
email: weave-gitops-bot@weaveworks.org
folder: Formula
homepage: "https://docs.gitops.weaveworks.org/docs/getting-started"
description: "GitOps support for Kubernetes"
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ For more information please see the [docs](https://docs.gitops.weaveworks.org/do

## FAQ

Please see our Weave GitOps OSS [FAQ](https://www.weave.works/faqs-for-weave-gitops)
Please see our Weave GitOps OSS [FAQ](https://www.weaveworks.org/faqs-for-weave-gitops)

## Contribution

Expand Down
2 changes: 1 addition & 1 deletion pkg/services/gitrepo/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ func CommitAndPush(ctx context.Context, client git.Git, commitMsg string, logger
logger.Actionf("Committing and pushing gitops updates for application")

_, err := client.Commit(git.Commit{
Author: git.Author{Name: "Weave Gitops", Email: "weave-gitops@weave.works"},
Author: git.Author{Name: "Weave Gitops", Email: "weave-gitops@weaveworks.org"},
Message: commitMsg,
}, filters...)
if err != nil && !errors.Is(err, git.ErrNoStagedFiles) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,4 @@ Given that the exposure comes from modifications done in `GitopsCluster` objects
## For more information

If you have any questions or comments about this advisory:
* Email us at [security@weave.works](mailto:security@weave.works)
* Email us at [security@weaveworks.org](mailto:security@weaveworks.org)