Pull Request Map

[jasonkliu]

This is a map of all current pull requests and their status, cc @mnquintana @caseywatts When pull requests are linked together with →, merging the rightmost should merge all preceding ones.

:thumbsup: - reviewed, ready to merge :thumbsdown: - reviewed, merge problems :hand: - needs review

171 Payforms Printed :hand:

Old pull request from July 2013.

235 Report show → #239 unscheduled :thumbsup: → #244 location :thumbsup: → #268 loc groups :thumbsup:

235 fixes the popup menu and tons of Rails 3.2 issues - possibly needs review :hand: 239 is a single commit which fixes the start unscheduled shift button. 242 restores location routes etc. 268 looks to be build straight off of 244. → BRANCH OFF 235 → #241 shift report emails :thumbsup: 241 is a single commit which adds gem daemons. :exclamation: Why don't we just add this to 239...? → BRANCH OFF 235 → #272 active tasks :thumbsup: 272 is 3 commits which branch specifically off of 235.

236 Fake Location Email Task → #286 :thumbsup:

Fake email addresses for the demo site. Ready to merge, rebased into rails-3.2

234 Asset pipeline stylesheets → #254 superfish. :thumbsup:

Fixes the asset pipeline and restores the look of the headers.

257 stickies → #260 announcements :thumbsup:

No idea how to merge this because it's built off both 235 report show and 254 superfish. 260 is built straight off 257 :hand: . → #262 data objects :thumbsup: → #270 data types :thumbsup: Basically it's also built off 257 (252_superfish is merged) but the branches diverge at 684df45c3296c8d9054cc4645ed91132a9180232. 270 is built straight off of 262, except for 262 has an extra commit at the end which 270 doesn't have. → #264 links :thumbsup: This is built off of 257 also but diverges really early.

All of the pull requests I created are unrelated to those above and should merge without conflicts.

[njlxyaoxinwei]

To merge #236 into rails-3.2, Line 12 needs to be changed to validate: false as per Rails 3.2

Also I think with merging, Git just applies all the unmerged commits. Same commits won't get applied twice so merging those built off both #235 and #254 should be no problem as long as #235 and #254 are fine.

I created bootstrap branch off rails-3.2 for #273, and I merged EVERY pull request listed above into bootstrap branch without any (or with only trivial) merge conflicts.

[jasonkliu]

@njlxyaoxinwei: Sounds good. I had a meeting with @mnquintana yesterday and we discussed how Shifts is going to continue throughout the summer.

Here's the summary of the meeting:

• We need to finish the migration to Rails 3 as soon as possible, preferably within a month.
• The other goal for the near future is allowing multiple departments to work on one instance of shifts.

Here's the tasks we have to do to accomplish that:

• Review all of the pull requests here and merge them.
  • It's really hard to work on new features when there are so many pull requests. Machiste is going through the bootstrap branch and making sure that it works, and if so, there is a possibility that we just merge the bootstrap branch instead of all pull requests.
  • Alternatively, I'm looking through the pull requests separately and making sure that each is ready to merge. This is helpful to see if there's any errors that we can catch before everything is merged.
  • Regarding the branch problem, you might want to take a look into:
    git rebase --onto rails-3.2 branch_1 branch_2 see here
• Remove old plugins (dynamic_form, multiple_select, rails_upgrade, simple_time_select)
  • rails_upgrade is going last because there are still things to change. simple_time_select is the hardest to modify and I think all of the pull requests need to be merged before I can finish that. The other two plugins are done.
  • There are some assorted other deprecation issues such as routes.
• Move to bootstrap
• Update wiki and website (this is almost done, it's on hold while I wait for more documentation)
• Fix the test suite

Questions for you: 1) Is the migration of the (rjs/erb) files done? 2) Are all of the commits that you've made ready to merge, to the best of your knowledge? 3) Anything else that we should know?

[njlxyaoxinwei]

@jasonkliu To answer your questions:

1. No. See issue #147. There are still a couple left. When I worked on Shifts, I tried to fix one functionality at a time, so I haven't fixed everyone of them yet. I haven't looked at the code but I would guess that anything related to TimeSlots or Templates won't work until we have a working alternative of tooltip.js for the UI.
2. Almost all of them. I have one doubt in #263 (see my last comment) and that change is included in my pull request #272. I don't remember any other issue about my commits.
3. Not off the top of my head, but feel free to ask me when you want to know something. I left some comments on the bootstrap issue #273 about things I did not have time to implement but had some ideas of. Also my way of fixing #269 (See last comment) might be useful in other places like replacing deprecated observe_field with jquery and other problems in the views.

[caseywatts]

@jasonkliu is the situation in this issue still up to date?

Do we just need other Shifts developers to look at these pull requests? (@thomasweng15 and @njlxyaoxinwei)

[jasonkliu]

@caseywatts

I've reviewed them all and they seem good to go. I met with Machiste on July 3rd and he said that he would review and merge them soon.

[jasonkliu]

274 and #265 need reviewing / rebasing / etc. assignee: me

[mnquintana]

Hey @jasonkliu can you get on Slack?

[mnquintana]

All done!