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

Add comments Statuses to data model documentation #4318

Merged
merged 12 commits into from
Dec 18, 2018
Merged

Add comments Statuses to data model documentation #4318

merged 12 commits into from
Dec 18, 2018

Conversation

digitaldina
Copy link
Collaborator

@digitaldina digitaldina commented Dec 16, 2018

Fixes Part of #3331

  • tests pass -- look for a green checkbox ✔️ a few minutes after opening your PR -- or run tests locally with rake test
  • code is in uniquely-named feature branch and has no merge conflicts
  • PR is descriptively titled
  • ask @publiclab/reviewers for help, in a comment below

We're happy to help you get this ready -- don't be afraid to ask for help, and don't be discouraged if your tests fail at first!

If tests do fail, click on the red X to learn why by reading the logs.

Please be sure you've reviewed our contribution guidelines at https://publiclab.org/contributing-to-public-lab-software

Thanks!

@ghost ghost assigned digitaldina Dec 16, 2018
@ghost ghost added the in progress label Dec 16, 2018
@digitaldina
Copy link
Collaborator Author

@publiclab/reviewers check this out please!

@sashadev-sky
Copy link
Member

@dinaelhanan I cannot look at this right now but I added a label onto it to try and get it some attention :)

@plotsbot
Copy link
Collaborator

plotsbot commented Dec 17, 2018

1 Warning
⚠️ It looks like you merged from master in this pull request. Please rebase to get rid of the merge commits – you may want to rewind the master branch and rebase instead of merging in from master, which can cause problems when accepting new code!
1 Message
📖 @dinaelhanan Thank you for your pull request! I’m here to help with some tips and recommendations. Please take a look at the list provided and help us review and accept your contribution! And don’t be discouraged if you see errors – we’re here to help.

Generated by 🚫 Danger

* 3: draft
* 4: moderated -- i.e. node created by a first-time poster, and has not yet been "approved"

The status for Node is now the same for comment in our Code base except for status = 5
Copy link
Member

Choose a reason for hiding this comment

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

How about removing this line? @dinaelhanan

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

ok, will do. Thanks!

@grvsachdeva
Copy link
Member

Some changes to do @dinaelhanan and nice work 🎉. Thanks!

grvsachdeva and others added 3 commits December 17, 2018 19:36
Co-Authored-By: dinaelhanan <dinaelhanan@gmail.com>
Co-Authored-By: dinaelhanan <dinaelhanan@gmail.com>
@digitaldina
Copy link
Collaborator Author

@gauravano done. Thanks!


* 0: banned
* 1: normal
* 3: draft
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
* 3: draft

I forgot to tell you about removing draft status too 😐.

Copy link
Member

Choose a reason for hiding this comment

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

ok, I have made the change!

Copy link
Member

@grvsachdeva grvsachdeva left a comment

Choose a reason for hiding this comment

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

Nice work @dinaelhanan 🎉! Thanks!

@grvsachdeva grvsachdeva merged commit 0381254 into publiclab:master Dec 18, 2018
@grvsachdeva
Copy link
Member

Merged 💯 🎈

SrinandanPai pushed a commit to SrinandanPai/plots2 that referenced this pull request May 5, 2019
* Update node_tags.yml

* Update admin_controller_test.rb

* Update admin_controller_test.rb

* Update DATA_MODEL.md

* Update DATA_MODEL.md

* Update node_tags.yml

* Update doc/DATA_MODEL.md

Co-Authored-By: dinaelhanan <dinaelhanan@gmail.com>

* Update doc/DATA_MODEL.md

Co-Authored-By: dinaelhanan <dinaelhanan@gmail.com>

* Update DATA_MODEL.md

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

Successfully merging this pull request may close these issues.

4 participants