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

Jump to bottom

add .dockerignore and .editorconfig #238

Merged
merged 2 commits into from
Oct 16, 2017
Merged

add .dockerignore and .editorconfig #238

merged 2 commits into from
Oct 16, 2017

Conversation

bhaveshAn
Copy link
Member

@bhaveshAn bhaveshAn commented Oct 7, 2017 •
edited
Loading

Fixes #237

Checklist

  • I have read the Contribution & Best practices Guide and my PR follows them.
  • My branch is up-to-date with the Upstream master branch.
  • I have added necessary documentation (if appropriate)

Changes proposed in this pull request:

  • Add .editorconfig and .dockerignore
  • Add separate docs of installation and deployments inside /docs/installation/

@mariobehling please review.

@ghost ghost assigned bhaveshAn Oct 7, 2017
@ghost ghost added the needs-review label Oct 7, 2017
vaibhavsingh97
vaibhavsingh97 reviewed Oct 7, 2017
View reviewed changes
Copy link
Member

@vaibhavsingh97 vaibhavsingh97 left a comment

Choose a reason for hiding this comment

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

I think Heroku and Docker deploy button should be on README.

@bhaveshAn
Copy link
Member Author

Yes, they both are in README and respectively at heroku.md and docker.md as well according to this PR.

niranjan94
niranjan94 suggested changes Oct 8, 2017
View reviewed changes
Copy link
Member

@niranjan94 niranjan94 left a comment

Choose a reason for hiding this comment

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

@bhaveshAn please don't solve two completely unrelated issues in one PR. Let this PR solve only the readme/docs issue. Move the commit that solves the yahoo link issue to a different PR

@bhaveshAn
Copy link
Member Author

@niranjan94 I have Fixed both issues separately. For #239 fixed at #243 . Please review both PRs again.

@ghost
Copy link

ghost commented Oct 13, 2017

Hi @bhaveshAn!

Looks like your PR is behind the upstream
Could you rebase it on top of the latest upstream code ?

@bhaveshAn
Copy link
Member Author

@niranjan94 please review.
Commits can't be rebased further as the upstream commits will make mine.(if rebased more)

@ghost ghost removed the needs-review label Oct 15, 2017
@vaibhavsingh97
Copy link
Member

@bhaveshAn Please squash commits into one

@bhaveshAn
Copy link
Member Author

@S2606 Thanks !
@vaibhavsingh97 Commits can't be rebased further as the upstream commits will make mine.(if rebased more)

@bhaveshAn
Copy link
Member Author

@niranjan94 please review. Thanks

@niranjan94 niranjan94 merged commit 2ec4259 into fossasia:master Oct 16, 2017
@ghost ghost added the ready-to-ship label Oct 16, 2017
@bhaveshAn bhaveshAn deleted the enhance branch October 18, 2017 08:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vaibhavsingh97 vaibhavsingh97 vaibhavsingh97 left review comments

@niranjan94 niranjan94 niranjan94 approved these changes

@S2606 S2606 S2606 approved these changes

Assignees

@bhaveshAn bhaveshAn

Labels
ready-to-ship
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Add .editorconfig, .dockerignore and docs of installation and deployments
4 participants
@bhaveshAn @vaibhavsingh97 @niranjan94 @S2606