Spring Cleaning IS-4644 Enable use of auto-merging resolver #83
Conversation
| @@ -17,6 +17,8 @@ class Git | |||
| STAGING_PREFIX = "staging" | |||
| QAREADY_PREFIX = "qaready" | |||
|
|
|||
| RESOVLER_USED = nil | |||
There was a problem hiding this comment.
Don't use a constant for this. Make it an instance variable or something
|
|
Merged into staging.2014.07.28.
1 similar comment
|
|
| @@ -44,6 +44,10 @@ def github_repo | |||
| @github_repo || raise(MissingRequiredAttribute, "GitHub Repo is required") | |||
| end | |||
|
|
|||
| def merge_resolver | |||
| @merge_resolver || nil | |||
There was a problem hiding this comment.
why do we need an || nil here, if it is not defined it will just return nil
|
QA looks good |
| @@ -197,6 +197,7 @@ module Octopolo | |||
| Git.should_receive(:fetch) | |||
| Git.should_receive(:perform).with("merge --no-ff origin/#{branch_name}", :ignore_non_zero => true) | |||
| Git.should_receive(:clean?) { true } | |||
| Git.should_receive(:clean?) { true } | |||
There was a problem hiding this comment.
why is this duplicated from the line above?
There was a problem hiding this comment.
obj.should_receive(:message).once
obj.should_receive(:message).twice
obj.should_receive(:message).exactly(3).times
obj.should_receive(:message).at_least(:once)
obj.should_receive(:message).at_least(:twice)
obj.should_receive(:message).at_least(n).times
|
Let's add it to the readme too 🍻 |
|
QA still good, CR good |
|
|
|
|
This should resolve issue #52.
Rollback Plan
If this pull request requires anything more complex (e.g., rolling back a migration), you MUST update this section. Otherwise, delete this note.
To roll back this change, revert the merge with
git revert -m 1 MERGE_SHAand perform another deploy.URLs
QA Plan
Provide a detailed QA plan, or other developers will retain the right to mock you mercilessly.