Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

For #153 #154

Closed
wants to merge 4 commits into from
Closed

For #153 #154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
687303a
Removing old ResourceService example.
daniel-dgi Feb 18, 2016
4d8750c
Removing lock file and updating gitignore for collection service.
daniel-dgi Feb 18, 2016
20cd31f
Removing compooser.phar and more .gitignore updates.
daniel-dgi Feb 18, 2016
25fdc3d
Adding composer.lock back in. Ignoring composer installer.
daniel-dgi Feb 18, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions services/CollectionService/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
vendor/
composer.phar
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we keep composer.lock out of here?

http://stackoverflow.com/questions/12896780/should-composer-lock-be-committed-to-version-control

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From personal experience, including the lock files always ends with some sort of confusion over why things won't update when people are testing changes.

I understand this is contrary to what stack overflow says.

It's bitten me before many many times, and I make it a habit not to. With the understanding that I need to know what I'm doing if deploying straight from the git repo on a production environment.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On second thought, maybe I'm being too biased. Let's try it the 'correct' way. But if it turns out to be a serious PITA I'll issue a PR to get rid of them.

installer
2 changes: 1 addition & 1 deletion services/CollectionService/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"description": "RESTful service providing PCDM Collections in Fedora 4",
"repositories": [{
"type": "path",
"url": "../ResourceServiceProvider"
"url": "../ResourceService"
}],
"require": {
"islandora/chullo": "^0.0",
Expand Down
Loading