Style guide conformance #14
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
Colligo - vanilla blacklight app created
Feature capistrano
Feature mods
Feature annotation data
Feature iiif manifest data
Feature solr config
|
|
||
| # Ignore IDE and rubocop files | ||
| .idea/* | ||
| .rubocop.yml |
There was a problem hiding this comment.
I think it would be okay to check-in the rubocop.yml for this project. It allows others that come into the project in the future (even if that never ends up happening) to know what the guidelines you were using when developing this app, and that they should follow the same.
It's your call though, I'm not sold in one direction or the other.
|
Ah will do that. Also, there's still a conflict. Let me resolve that. |
added 2 commits
January 4, 2016 20:26
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.
Hmm, hoping the merge conflict will resolve once you have accepted the solr_config PR, as I created this PR only after I did a fetch and rebase of the upstream master. If not, I'll try again after the solr_config PR has been accepted.
Also, from the next PR I will be judicious with style guide conformance.