-
Notifications
You must be signed in to change notification settings - Fork 57
Rails 4.1 #774
Conversation
…and need to replaced by integration tests
Fixed up that user controller bug; I had changed around the users controller without updating the spec accordingly |
The fuubar issue apparently shows up at the end of tthe rspec run (which I hadn't gotten to:
Trying a workaround from here fixed it! |
two more deprecation warnings but all tests pass, I'm going to add them to #779. After we finish the 3.4.0 hotfixes I'll come back to this for a second look-over so we can merge. |
On a separate note, I'd also like to update to Ruby 2.1.2 with this release since there are known issues building 2.1.1 which popped up while investigating Vagrant (#769). I assume there are no breaking changes, but we should review the changelog quickly to make sure. |
The changelog for 2.1.2 reveals no obvious breakage points (entirely bugfixes and minor version dependency upgrades afaict), so we should go for it imo. |
merge conflict whaddup also can we bump the Ruby version to 2.1.2? |
sure |
We just have to deal with the new always-red flash notices, right? |
oh i totally forgot about that |
The reservations Index table will error out if you've deleted an equipment model. This may or may not also be a problem on master. The highlighted line in the error log says
The strace is:
_EDIT:_ This is also erring out on the catalogue index. _EDIT2:_ This is not a problem on master. |
nevermind, that equipment model had been in my cart and is also an issue on master. |
I submitted the Quick New User button with the "NetID" of @squidgetx is currently unable to replicate, @orenyk please verify either way. |
... I suddenly can't replicate this after switching to a different branch and switching back. Weird. |
Great. I'm not at a computer so it would have taken me a while to check, |
You don't need to touch
|
Nice catch. |
Main Changes:
Time.now
andDate.today
are handled (should always beTime.current
andDate.current
, these take the time zone specified in config into account where the other methods will use system time, which fails in any case where the server is in a different time zone than the client including Travis sometimes). Override Date.today, .tomorrow, and .yesterday in rails_extensions.rbbutton_to_function
with simplelink_to
withonclick()
attributes