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.

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

Pull Requests HOWTO #649

Closed
andy5995 opened this issue Sep 19, 2017 · 6 comments
Closed

Pull Requests HOWTO #649

andy5995 opened this issue Sep 19, 2017 · 6 comments

Comments

@andy5995
Copy link
Contributor

andy5995 commented Sep 19, 2017

@julianguyen I added a page to the wiki.

https://github.com/julianguyen/ifme/wiki/HOWTO:-Pull-Requests

If you like it, a link to it can be added in the README.md (heading: Committing work -> pull requests), or the wiki page can be integrated into the README

I adapted the instructions from one of my existing projects, and I think it's mostly all good, but definitely could use a review by anyone here.

@architapatelis
Copy link
Contributor

@julianguyen if you'd like I can add the Pull Request Instructions directly to README.md or to Workflow.md under the Committing Work section. I also found a minor typo in the wiki, Periodically, you'll need the sync your repo with mine (the upstream). You have to change the to to. Please let me know when you have the time, thanks!

@ghost
Copy link

ghost commented Oct 5, 2017

I think it would be best to add it to WORKFLOW.md, since we just finished reorganizing the documentation so everything wasn't piled into the README.md.

architapatelis added a commit to architapatelis/ifme that referenced this issue Oct 5, 2017
architapatelis added a commit to architapatelis/ifme that referenced this issue Oct 5, 2017
@v27u27
Copy link

v27u27 commented Oct 6, 2017

Can anybody tell me, what exactly has to be done to resolve this issue, because i want to contribute, and just for your information i am a beginner in open source contributions.

@architapatelis
Copy link
Contributor

@dippersauce @julianguyen I made a pull request earlier today, please have a look and let me know if anything needs fixing. Thanks in advance!

architapatelis added a commit to architapatelis/ifme that referenced this issue Oct 6, 2017
architapatelis added a commit to architapatelis/ifme that referenced this issue Oct 7, 2017
architapatelis added a commit to architapatelis/ifme that referenced this issue Oct 8, 2017
architapatelis added a commit to architapatelis/ifme that referenced this issue Oct 8, 2017
architapatelis added a commit to architapatelis/ifme that referenced this issue Oct 8, 2017
julianguyen pushed a commit that referenced this issue Oct 8, 2017
* fixed merge conflict in WORKFLOW.md during rebase

* [#649] - added instructions for pull request and syncing to WORKFLOW.md

* [#649] in Workflow.md create a link to a wiki for how to create a pull request and syncing

* [#649] removed HOW TO: from title and added space between upstream(ifme).
alvarocasadoc pushed a commit to alvarocasadoc/ifme that referenced this issue Oct 23, 2017
* fixed merge conflict in WORKFLOW.md during rebase

* [ifmeorg#649] - added instructions for pull request and syncing to WORKFLOW.md

* [ifmeorg#649] in Workflow.md create a link to a wiki for how to create a pull request and syncing

* [ifmeorg#649] removed HOW TO: from title and added space between upstream(ifme).
julianguyen pushed a commit that referenced this issue Oct 24, 2017
* Add clarification to run yarn before rspec (#674)

* Update press page, cleanup search box CSS, hide moments graph on mobile

* Add Team ifPairElseUnknown's blog posts to Press page

* CSS fix on search boxes

* Hide unresponsive moments graph on mobile

* refact: move remove's responsibility to model instead from controller

* solve issue #57 (#678)

* Fix bug in shared form view (closes #625) (#677)

* Fix bug in shared form view

* Edit form view for brevity

* Remove package-lock.json

* Add to Resources page

* refact: move tests from allies controler to allyship models

* Add GET #show meeting_controller_spec

* refact: static code analysis

* feat: add new test to check if an allyship was destroyed successfully

* Add medications controller tests (#681)

* Add tests for index and new routes

* Add test for show route

* Split README.md Into Multiple Files [Hacktoberfest] (#680)

* Split README.md into multiple files

* Tweak README.md

* Fix tiny typo

* Removed Donate and License Links

* Another tiny fix 🙄

* test

* Added Links to Files in README.md

* Fix Typo

* Totally the last type fix

* Moved Contributer Blurb to README.md for Prominance

* Update README.md

* Update README.md

* Update DESIGN.md

* Update INSTALLATION.md

* Update INSTALLATION.md

* Update README.md

* Update TESTING.md

* Update WORKFLOW.md

* Update DESIGN.md

* Update INSTALLATION.md

* Fix broken links in README

* Fix heading bugs in README

* refact: create new private functions into allyship models

* Add delete_comment specs for meetings_controller

* feat: add a test to check if viewers (between users) were deleted after an allyship is destroyed

* Add specs for new for meetings_controller

* Add edit specs for meetings_controller

* Added full-screen modal CKEditor on mobile web (closes #538) (#684)

* Basic solution to the #538

* Removed redundant bit of code (issue #538)

* Fixed issues for the PR#684 and added feature tests for the modal editor

* Now this test resizes the window after being executed to a desktop resolution to prevent future conflicts with other tests

* Fixed ModalEditorSpec.js error when running jasmine:ci

* Refactored modal_editor.js to stick to ESLint's guidelines

* file added: ChangeLog.md (closes #651) (#670)

* file added: ChangeLog.md (closes #651)

* improved text formatting and layout

I went with bullets because I wanted indentation, but also
planning ahead (for times where there would be more than
one item underneath a date, or when multiple items might be
used for describing a new feature.

* applied @julianguyen 's instructions

* Added draft/published functionality to moments/strategies

* Added draft stories filtering functionality

* fix: broken links in README.md (#692)

* Moved docs into documentation folder (#694)

As discussed in Slack, docs have been moved out of root for repo cleanliness and standardization.

* Updated hidden_page? in application_controller.rb to filter draft moments/strategies

* Modified most_focus on application_controller.rb to filter drafts so they are not counted in the stats of other users' profiles

* Add ability to debug with foreman (thanks to @SophieRoseMcDonald @jnamster) (#698)

* Fix puma.rb bug on production

* Added model tests for draft/published feature

* Added model tests for draft/published feature

* Modified application_controller_spec.rb to test draft/published functionality

* Refactored moments/strategies form to include a switch for the draft/published feature

* Added temporary translations to locale files for draft/published feature

* Added feature tests for draft moments

* Added feature test for draft strategies

* Fixed _form partial for strategies

* Added ptbr translations for draft/published feature (thanks to @localhostpedro for helping with the translation)

* Pull request how to issue 649 (#689)

* fixed merge conflict in WORKFLOW.md during rebase

* [#649] - added instructions for pull request and syncing to WORKFLOW.md

* [#649] in Workflow.md create a link to a wiki for how to create a pull request and syncing

* [#649] removed HOW TO: from title and added space between upstream(ifme).

* Added sv translation for draft/publish feature (thanks to @alexiamcdonald)

* change the contributors route to contribute, change helper functions and all function calls. (#701)

change locales keys from contributor to contribute and reflect all locale yml file key calls from view files.
change the respec test to reflect the change of route from contributors to contribute

* Added a migration for setting every post's updated_at field as default value for its publication date

* Fixed typos

* Updated tag_usage to filter drafts

* Updated some code styling elements in moment/strategy and application controllers

* Updated moments and strategies controllers to make quick created posts published by default

* Updated some code styling elements in moment/strategy and application controllers

* Updated some code styling elements in application controllers

* fix link to CONTRIBUTING doc

* Add Translations documentation link to README

* fix link to contribution page

* Adding myself as a contributor. (#695)

* Adding myself as a contributor.

* fixes json syntax error

* accept any version of ruby 2.3 in the Gemfile (#710)

according the heroku docs it's recommended to accept a wider range of ruby versions in the gemfile https://devcenter.heroku.com/articles/ruby-versions

This will help people avoid errors because their ruby version is a slight mismatch

* Persisting browser locale after sign in #703

* Using guard clause

* move conditional to other private method

* Annotate models (#706)

* updates docker file to install yarn and node (#711)

* Switched all double quotes to sinlge quotes (#722)

* Update contributors.json (#727)

* Add 1 resource and 1 tag  (#731)

* Add internalization for teachers tag (issue 486).

* Add new service to resource page

* Add contributor.

* Fixing test for persisting locale after sign in (#732)

Added some expects that wait for elements to appear before moving on. I suspect the page hasn't finished loading when the next step in the test starts to immediately run.

* Fixed input styling on mobile medications page (Fixes #713) (#725)

* Styled children of .form_container to use flexbox

* Removed margin-right from select in mobile

* Removed unused CSS rules from mobile

* Converted tabs to spaces

* Refactored some html and css for a cleaner code

* Refactored css and html to make draft switch responsive by using flexbox

* Refactored controller for a DRY friendlier solution

* Refactored controller for a DRY friendlier solution

* Added empty keys for draft strings for NL translations

* Update nl.yml with draft translations

The title says it all really. Muchos gracias!
@ginna-baker
Copy link

This issue looks ready to close

@julianguyen
Copy link
Member

Aha you're right, let's do that! :) Thank you!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

No branches or pull requests

5 participants