allow cross-development across forks#108
Closed
bill-auger wants to merge 8 commits intosigmike:masterfrom
Closed
Conversation
Conflicts: app/controllers/projects_controller.rb app/views/projects/show.html.haml app/views/projects/show.svg.erb
Conflicts: app/views/users/show.html.haml
Conflicts: public/favicon.ico
* these modifications allow cross-development of the various forks which have drifted out of compatibility * config/application.rb loads config/config.yml pre-processed (switchable in config/config.yml and config/database.yml - [see here for example](https://github.com/bits4commits/bits4commits/blob/master/config/config.yml)) * added coverage/ to .gitinore (this dir exists on the tip4commit fork)
Author
|
sry this was targetted at sigmike/prime4commit - apparently that repo is off and bounced here - is the prime4commit site defunct ? |
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.
this is the equivelant for this repo of similar commits to the tip4commit and peer4commit forks
peer4commit:
#105
tip4commit:
tip4commit#123