This repository has been archived by the owner on Jul 24, 2020. It is now read-only.
947 defaultconfigs #962
Merged
947 defaultconfigs #962
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
| @@ -0,0 +1,11 @@ | |||
| class SetSaneConfigDefaults < ActiveRecord::Migration | |||
| def change | |||
| config = AppConfig.first | |||
There was a problem hiding this comment.
Looking over this again, I don't think we need to save the current app configs any more in the migration. We should take out this line and re-run the migrations just to make sure everything is still happy :-)
|
Are we not worried that three of the commits failed travis tests, since the main build passed? |
|
Otherwise, I was able to check out the branch and run db:reset with no problems, and site functionality looks good! |
|
Nope, the only Travis result we care about is the final one. I'll merge master into here and then merge it in :-). |
Conflicts: Gemfile.lock db/schema.rb spec/factories/app_configs.rb
|
Failing build has to do with the changing of the clocks (see #939). Merging! |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Resolves #947