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_tag => tag #1178

Merged
merged 1 commit into from Jan 10, 2017
Merged

drupal_tag => tag #1178

merged 1 commit into from Jan 10, 2017

Conversation

ghost
Copy link

@ghost ghost commented Jan 10, 2017

I'm back :D

Part of #956

it is failing one test, as you should see in travis. @jywarren pointers?

  • 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
  • if possible, multiple commits squashed if they're smaller changes
  • reviewed/confirmed/tested by another contributor or maintainer
  • schema.rb.example has been updated if any database migrations were added

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 [email protected] when your request is ready or if you need assistance.

Thanks!

@ghost ghost requested a review from jywarren January 10, 2017 18:43
@@ -343,5 +343,8 @@ DEPENDENCIES
will_paginate (>= 3.0.6)
will_paginate-bootstrap (>= 1.0.1)

RUBY VERSION
Copy link
Member

Choose a reason for hiding this comment

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

Hi, welcome back! Great to see your work here.

I'm curious, do you have Gemfile.lock in your .gitignore file? I was wondering why its been added to your changes; just checking! We don't need it to be, I believe.

I'll go through more of this soon, thank you!

@jywarren
Copy link
Member

Hmm, it seems to be passing, and wow, a very thorough body of work! It's rebased on top of the latest master?

We now have a staging server we can try things like this out on before going live with them. So I have more confidence in merging this. What do you think?

@ghost
Copy link
Author

ghost commented Jan 10, 2017 via email

@jywarren
Copy link
Member

Great, can you revert the changes from the Gemfile.lock and push up one more commit? Thanks!!

@ghost
Copy link
Author

ghost commented Jan 10, 2017

@jywarren should be all better now :)

I'll go through the rest of those #956 issues too maybe :D

@jywarren jywarren merged commit b1422ff into publiclab:master Jan 10, 2017
@jywarren
Copy link
Member

Merged!!! I'm going to move it to the stable branch so it can be tested out there before publishing. Thank you, amazing work!

@jywarren
Copy link
Member

OK - it's building here, now: http://staging.laboratoriopublico.org/

Once it's done, it can be tested out here; http://testing.laboratoriopublico.org/

Give me a thumbs up after making/editing/deleting a few tags and checking out the tags pages?

Thank you!!! 🎉

@ghost
Copy link
Author

ghost commented Jan 11, 2017 via email

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.

1 participant