Merge mentoring features with i18n work #49
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
…e's #collection method.
|
I've made a few changes. Otherwise, I think this is ready to merge. I'm not keen on the person form asking me "Would you like to be a mentor?" and "mentee?" when it could just check to see if I've put anything into the associated textareas to determine this on its own. However, given that this feature has functioned this way for a while, I'm creating issue #51 to keep track of that. |
|
Now that it's possible to control mentoring features using a toggle in settings, we can merge the mentoring features into master. I've rebased them on top of the i18n work and Igal's cleaned things up a bit. |
reidab
added a commit
that referenced
this pull request
Nov 5, 2011
Merge mentoring features with i18n work
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.
No description provided.