Ticket/28817 fix api tests for new features#82
Merged
nemoDreamer merged 3 commits intomasterfrom Mar 25, 2015
Merged
Conversation
Contributor
nemoDreamer
commented
Mar 24, 2015
nemoDreamer
commented
- cherry-picked 2 improvements from Ticket/28441 hide template projects by default #79, to allow for less duplication later on.
- added version checks for Per-Project Customization parameter
- wrapped tests in version checks
nemoDreamer
force-pushed
the
ticket/28817_fix_api_tests_for_new_features
branch
from
f4a5909 to
7a26d76
Compare
Contributor
Author
There was a problem hiding this comment.
@manneohrstrom, I'd been tasked w/ fixing this, and only saw much later that you'd fixed the project aspect of this...
So this is the conflict resolution, I hope you don't mind I kept "mine", since I'd already cherry-picked my ensure_... changes over from #79...
Contributor
There was a problem hiding this comment.
No worries at all - this was just a quick fix to get the tests working on older servers. Looks like you have done a much more holistic pass, trying to clean things up properly (which is totally awesome!). So please ignore/discard any of my changes in favour of your proper changes. This was just a quick fix to make sure we can release the API with all tests passing.
nemoDreamer
force-pushed
the
ticket/28817_fix_api_tests_for_new_features
branch
from
7a26d76 to
14e283e
Compare
nemoDreamer
force-pushed
the
ticket/28817_fix_api_tests_for_new_features
branch
from
14e283e to
7963a06
Compare
nemoDreamer
added a commit
that referenced
this pull request
Mar 25, 2015
…s_for_new_features Ticket/28817 fix api tests for new features
Contributor
|
Awesome !! |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.