From 3b43e20761a97f84bae17436ee1bd86871c8efba Mon Sep 17 00:00:00 2001 From: Joe Siewert Date: Wed, 8 Nov 2023 16:10:31 -0600 Subject: [PATCH 1/3] Switch badge to GitHub Actions --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 209b6d38..4b4e6e51 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Vault Rails [![Build Status](https://circleci.com/gh/hashicorp/vault-rails.svg?style=shield)](https://circleci.com/gh/hashicorp/vault-rails) +Vault Rails [![Build Status](https://github.com/hashicorp/vault-rails/actions/workflows/run-tests.yml/badge.svg?branch=main)](https://github.com/hashicorp/vault-rails/actions/workflows/run-tests.yml) =========== Vault is the official Rails plugin for interacting with [Vault](https://vaultproject.io) by HashiCorp. From ee78834c142089206ac59d327adb390fdd5efab0 Mon Sep 17 00:00:00 2001 From: Joe Siewert Date: Wed, 8 Nov 2023 16:15:58 -0600 Subject: [PATCH 2/3] Uses main branch now --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4b4e6e51..7f09f04c 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ Vault Rails [![Build Status](https://github.com/hashicorp/vault-rails/actions/wo Vault is the official Rails plugin for interacting with [Vault](https://vaultproject.io) by HashiCorp. -**If you're viewing this README from GitHub on the `master` branch, know that it may contain unreleased features or +**If you're viewing this README from GitHub on the `main` branch, know that it may contain unreleased features or different APIs than the most recently released version. Please see the Git tag that corresponds to your version of the Vault Rails plugin for the proper documentation.** From 980652aa215e6891b7895363e385e99dc4a3b959 Mon Sep 17 00:00:00 2001 From: Joe Siewert Date: Wed, 8 Nov 2023 16:20:44 -0600 Subject: [PATCH 3/3] Fix typo --- lib/vault/encrypted_model.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/vault/encrypted_model.rb b/lib/vault/encrypted_model.rb index 64a8d889..1af2c85e 100644 --- a/lib/vault/encrypted_model.rb +++ b/lib/vault/encrypted_model.rb @@ -212,7 +212,7 @@ def parse_transit_attributes(attribute, options) after_initialize :__vault_initialize_attributes! # After we save the record, persist all the values to Vault and reload - # them attributes from Vault to ensure we have the proper attributes set. + # the attributes from Vault to ensure we have the proper attributes set. # The reason we use `after_save` here is because a `before_save` could # run too early in the callback process. If a user is changing Vault # attributes in a callback, it is possible that our callback will run