Skip to content
This repository has been archived by the owner on Jul 24, 2020. It is now read-only.

[1329] Update dependencies #1367

Merged
merged 1 commit into from
Jan 13, 2016
Merged

[1329] Update dependencies #1367

merged 1 commit into from
Jan 13, 2016

Conversation

orenyk
Copy link
Contributor

@orenyk orenyk commented Dec 9, 2015

Resolves #1329, updates Ruby, Rails, and all gems, along with associated tweaks / fixes.

@orenyk orenyk mentioned this pull request Dec 10, 2015
Closed
8 tasks
@orenyk
Copy link
Contributor Author

orenyk commented Dec 14, 2015

I just found out that permanent_records has been updated to resolve the dependency issue, so I'll get it updated as well.

@orenyk
Copy link
Contributor Author

orenyk commented Dec 14, 2015

all done!

@squidgetx
Copy link
Contributor

sweet

@orenyk
Copy link
Contributor Author

orenyk commented Jan 4, 2016

Whoops have to deal with some merge conflicts... probably from #1395

@orenyk
Copy link
Contributor Author

orenyk commented Jan 4, 2016

Ok, squashed and rebased onto master - @squidgetx, can you just look it over again to make sure I didn't break anything in the process? The only merge conflicts were in spec/controllers/users_controller_spec.rb so everything else should be the same. Thanks!

This was referenced Jan 5, 2016
Merged
Closed
@orenyk
Copy link
Contributor Author

orenyk commented Jan 5, 2016

I've identified a bug - it appears as though some part of datatables is broken in this branch (the JS exceptions is TypeError: invalid 'in' operand obj):

selection_071

My guess is that this has to do with the outdated version DataTables, which is fixed in #1378. However, since I've got the PR for that issue on master blocked on this PR, I'm going to just open up a new issue for this bug that we can close as long as the issue is resolved once everything is updated.

EDIT: Known issue with the gem, so merging in the fix for #1378 on master should work. I'm still going to open a new issue just so we don't forget to check.

@orenyk orenyk mentioned this pull request Jan 5, 2016
Closed
@squidgetx
Copy link
Contributor

Yea as long as that is also put in we should be good. Isn't 1378 already merged on master?

@orenyk
Copy link
Contributor Author

orenyk commented Jan 12, 2016

No, I was waiting to merge this in before cherry-picking the commit over since there will be merge conflicts with Gemfile / Gemfile.lock most likely. I'll merge this in today and set up the new PR.

@orenyk
Copy link
Contributor Author

orenyk commented Jan 12, 2016

Since it's been so long a few of these updates were out of date. I'm updating now, but we should probably have someone take another look.

The only issue I ran into was with shoulda_matchers - there were some newly broken tests due to recent updates so I'm going to leave it at v3.0.1 instead of v3.1.0 (edit: see this issue), and we can update the next time we do this kinda thing. I'm going to rebase and push; @squidgetx can you take one more look? Thanks!

@orenyk
Update Ruby / Rails / gem dependencies
bb07543 
Resolves #1329
- update Ruby to 2.2.3
- update Rails to 4.2.5
- update remaining gems to latest versions
@squidgetx
Copy link
Contributor

These are the costs of being on the bleeding edge (/s??)
anyway yea go ahead and merge

@orenyk
Copy link
Contributor Author

orenyk commented Jan 13, 2016

Thanks!

orenyk added a commit that referenced this pull request Jan 13, 2016
@orenyk
Merge pull request #1367 from YaleSTC/1329_update_dependencies
0473921 
[1329] Update dependencies
@orenyk orenyk merged commit 0473921 into master Jan 13, 2016
@orenyk orenyk mentioned this pull request Jan 19, 2016
Open
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Update dependencies (gems / Rails / Ruby)
2 participants
@orenyk @squidgetx