Manually merge staging into master #956
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
* edited the env file * changed company name to UTF-8
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
* feat(tests): add code coverage reporting * fix: correct coverage path * refactor: use simplecov-lcov * fix: indentation in Gemfile.lock * fix: remove test filters * feat(README): add badge * refactor: try tokenless report uploading * chore: update codecov-action * chore: update codecov-action * fix(cd): pass CODECOV_TOKEN To ci
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
* Intial commit * updated apliction.rb * Fixed mistake in credentials * Made it so the file is backwards compatiable * Fixed a typo * Update amber_oauth2.rb remove tomato paramater
* intial commit * Fix typo * update tomato to sofia * updated with suggestion
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When we try to run Continuous Delivery on master, this depends on the Continuous Integration from staging, but this doesn't work because we've not properly taken care of first providing the codecov secret in CD in one commit, merging to master, and later requiring the codecov secret in CI in another commit.
So we fix things manually by updating the CD in master this way.