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

Upgrade: Ruby 2.6, Rails 4.2 and Node 13 #499

Merged
merged 57 commits into from
Jul 2, 2020
Merged

Upgrade: Ruby 2.6, Rails 4.2 and Node 13 #499

merged 57 commits into from
Jul 2, 2020

Conversation

alaxalves
Copy link
Member

@alaxalves alaxalves commented Apr 28, 2020

Make sure these boxes are checked before your pull request is ready to be reviewed and merged. Thanks!

  • tests pass -- rake test
  • 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 are descriptively named
  • if possible, multiple commits squashed if they're smaller changes
  • reviewed/confirmed/tested by another contributor or maintainer

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

Thanks!

@jywarren
Copy link
Member

Wow this is huge! I guess, i'd like to suggest we get this running in a staging instance, if possible. We are currently prioritizing the MapKnitter containerization (publiclab/mapknitter#1191) and then the utf-8/emoji issue on plots2 (publiclab/plots2#3007), but perhaps we can schedule some time for this after those?

This is much appreciated! 🎉 🎉 🎉 🎉

@alaxalves
Copy link
Member Author

alaxalves commented Apr 28, 2020

Wow this is huge! I guess, i'd like to suggest we get this running in a staging instance, if possible. We are currently prioritizing the MapKnitter containerization (publiclab/mapknitter#1191) and then the utf-8/emoji issue on plots2 (publiclab/plots2#3007), but perhaps we can schedule some time for this after those?

This is much appreciated!

Thanks Jeff, the cloud setup for MK has been finished at publiclab/mapknitter#1273

@alaxalves alaxalves mentioned this pull request May 7, 2020
3 tasks
@alaxalves
Copy link
Member Author

Fixes #504 and #503 and #502

@cesswairimu
Copy link
Contributor

Great great job 🎉 🎉 @alaxalves ... do we have an "unstable" instance for this repo..maybe we could push it there and have folks test it for a day or two like we did with Mapknitter? before merge...what do you think?
Fantastic work here 💯 ..thanks

@jywarren
Copy link
Member

Yes, it's running at https://unstable.spectralworkbench.org/capture -- amazing!

I tried saving a spectrum, though, and got a 500 error after being redirected here: https://unstable.spectralworkbench.org/spectrums

image

image

We don't have Sentry installed here, but it could make this debugging easier? @alaxalves were you able to save spectra locally?

Looks like we are ALMOST THERE folks. This is amazing. @alaxalves thank you a zillion -- fingers 🤞 we get this last thing!

@alaxalves
Copy link
Member Author

Yes, it's running at https://unstable.spectralworkbench.org/capture -- amazing!

I tried saving a spectrum, though, and got a 500 error after being redirected here: https://unstable.spectralworkbench.org/spectrums

image

image

We don't have Sentry installed here, but it could make this debugging easier? @alaxalves were you able to save spectra locally?

Looks like we are ALMOST THERE folks. This is amazing. @alaxalves thank you a zillion -- fingers we get this last thing!

Hmm, Yes I have! I'll check this out, maybe a config has changed in production 🤔

@alaxalves alaxalves force-pushed the development branch 10 times, most recently from d76e373 to 7cec07f Compare July 2, 2020 01:25
@alaxalves
Copy link
Member Author

@jywarren Just fixed the Spectrum savings problem, I took advantage and fixed the protected attributes issue.

https://unstable.spectralworkbench.org/spectrums/1

@jywarren
Copy link
Member

jywarren commented Jul 2, 2020

Perfect! Thanks alax!!

@jywarren jywarren merged commit 380ef67 into main Jul 2, 2020
@jywarren
Copy link
Member

jywarren commented Jul 2, 2020

Great work! Congratulations!!!!! 🔥🔥🔥🔥🔥🔥

jywarren added a commit that referenced this pull request May 18, 2021
@@ -163,7 +163,7 @@ def delete
def edit
@set = SpectraSet.find params[:id]
if @set.user_id == current_user.id || current_user.role == "admin"
@spectrums = Spectrum.find(:all, :limit => 4, :order => "created_at DESC")
@spectrums = Spectrum.all.order(created_at: :desc).limit(4)
Copy link
Member

Choose a reason for hiding this comment

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

Here we could take out .all but it may not be needed

@@ -176,7 +176,7 @@ def search
end

def recent
@spectrums = Spectrum.find(:all, :limit => 10, :order => "id DESC")
@spectrums = Spectrum.all.order(id: :desc).limit(10)
Copy link
Member

Choose a reason for hiding this comment

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

maybe remove all

@@ -442,7 +442,7 @@ def clone_calibration
end

def all
@spectrums = Spectrum.find(:all).paginate(:page => params[:page])
@spectrums = Spectrum.all.paginate(:page => params[:page])
Copy link
Member

Choose a reason for hiding this comment

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

maybe remove all

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.

5 participants