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

Drupal node to node #1342

Merged
merged 23 commits into from Mar 16, 2017

Conversation

@jywarren
Copy link
Contributor

commented Mar 16, 2017

Supercedes #1319 and #1320, #1105, #1100, relates to #956 and adds to lots of @aayushgupta1's work, thank you so much!

  • all tests pass -- rake test:all
  • code is in uniquely-named feature branch, and has been rebased on top of latest master (especially if you've been asked to make additional changes)
  • pull request is descriptively named with #number reference back to original issue

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

We have a loose schedule of reviewing and pulling in changes every Tuesday and Friday, and publishing changes on Fridays. Please alert developers on plots-dev@googlegroups.com when your request is ready or if you need assistance.

Thanks!

@PublicLabBot

This comment has been minimized.

Copy link

commented Mar 16, 2017

2 Messages
📖 @jywarren 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!
📖 You have added multiple commits. It’s helpful to squash them if the individual changes are small.

Generated by 🚫 Danger

@jywarren

This comment has been minimized.

Copy link
Contributor Author

commented Mar 16, 2017

OK, fingers crossed, I found another circular reference.

jywarren added 2 commits Mar 16, 2017
@aayushgupta1

This comment has been minimized.

Copy link
Contributor

commented Mar 16, 2017

@jywarren kindly check your forked repository in the branch. I made some changes that I forgot to make I think. Kindly look into it. Thanks

@jywarren

This comment has been minimized.

Copy link
Contributor Author

commented Mar 16, 2017

@aayushgupta1 omg it ran! I'm going to look through everything to be sure.

@jywarren

This comment has been minimized.

Copy link
Contributor Author

commented Mar 16, 2017

It's great. I found we can dump a couple locale files and that should pass too. Then I'll merge -- fantastic work, @aayushgupta1 !!!

@jywarren jywarren merged commit 8f76ca8 into publiclab:master Mar 16, 2017
1 check passed
1 check passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@jywarren jywarren removed the in-progress label Mar 16, 2017
@jywarren jywarren referenced this pull request Mar 16, 2017
3 of 3 tasks complete
@aayushgupta1

This comment has been minimized.

Copy link
Contributor

commented Mar 17, 2017

@jywarren That's great. Thanks for the help and the support. It's a great feeling of getting a merged PR of such a big topic. Learnt a lot from my mistakes and hope to not repeat again. Will keep working. Thanks

vaibhavgeek added a commit to vaibhavgeek/plots2 that referenced this pull request Mar 23, 2017
* DrupalNode to drupal_node

* Update node.rb

Updated node.rb file

* Delete drupal_node.rb

deleted drupal_node.rb file

* Update node.rb

Updated node.rb

* Update wiki_controller.rb

resolving wiki_controller.rb issues

* drupal_node.rb add

* Update wiki_controller.rb

* Update wiki_controller.rb

* Found recursive error

Fixed node reference to self and removed it.

* Additional removal of self-referential method

* Updating files

* Updating config

* Updating Config

* removing drupal_node.rb

* drupal_user ban/unban circularity fix

* found another circular reference

* drupalNode fix

* one more

* Update node_series_tag_test.rb (publiclab#250)

* Update wiki_controller_test.rb (publiclab#249)

* Update notes_controller.rb (publiclab#248)

* Update admin_controller.rb (publiclab#247)

* removing legacy locales
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.