merge feature in progress - #32
Open
rmtolmach wants to merge 17 commits into
Open
Conversation
| article2 = Article.find(params[:merge_me]) | ||
| # add body from article2 to the body of article1 | ||
| @article1.body = @article1.body + article2.body | ||
| # delete article2 |
There was a problem hiding this comment.
Nitpick - I'd keep your comments indented the same way your code is
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
2 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.
I wrote cucumber tests that are not all passing at the moment. Currently, admins can enter the id of a article they want to merge and it will tell you it was merged and delete the article. BUT, it does not actually merge them.