Code Clean Up Reviewed, Ruby comments removed, Rebased & Resolved Merge Conflicts for PR #369 #381
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
- Deleted comments that were ok to delete - Fixed merge conflicts - Merged remote-tracking branch 'ThePletch/367-code-cleanup' into spokenvote-380 # Conflicts fixed: # app/controllers/application_controller.rb # app/controllers/proposals_controller.rb # app/models/notification_builder.rb # app/models/proposal.rb
|
@ThePletch I replaced the intercept code that kept the app from running, deleted all comments that were good to delete, and merged in your commits here from PR #369. Please have a final look over and see if you like the final result. Thanks! 🔺 |
kimardenmiller
changed the title
|
@ThePletch I've complete further testing, including on the staging server. Feel good about the code and will merge in the coming day. Thanks again! 💯 |
This was referenced Aug 17, 2015
Closed
kimardenmiller
added a commit
that referenced
this pull request
Aug 18, 2015
Code Clean Up Reviewed, Ruby comments removed, Rebased & Resolved Merge Conflicts for PR #369
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.
@ThePletch Here are my comments on deleting commented code.
Again, thanks for all the amazing cleanup! 👍