NOTE: I will send patch 12/12 separately as an attachment, it contains
a line too long to use git send-email on.
[PATCH conductor 01/12] Remove a bunch of old views.
[PATCH conductor 02/12] Rails 2->3 framework changes
[PATCH conductor 03/12] gem dependency changes (now use Bundler)
[PATCH conductor 04/12] Rails 3 config changes.
[PATCH conductor 05/12] Rails 3 application changes
[PATCH conductor 06/12] Rails 3 views changes
[PATCH conductor 07/12] Rails 3 spec/cucumber changes
[PATCH conductor 08/12] Misc rails 3 related changes
[PATCH conductor 09/12] Remove Prototype (and friends).
[PATCH conductor 10/12] Remove uncompressed ui js files.
[PATCH conductor 11/12] Don't require developers keep -testing repo
This patchset should apply on top of next, current commit is:
commit 4cd75ae4aea6d4a51632daad7c445fccd36faa22
Author: Tomas Sedovic <tsedovic(a)redhat.com>
Date: Fri Jul 8 16:59:27 2011 +0200
I suggest you apply on top of this commit in your dev branch,
then update next and rebase your branch. This should result
in few, if any, conflicts that you will need to resolve.
Some of these commits may need a little amending/fixing. For
instance, I tried to update routes, but the syntax is substatially
different, so I was not sure the correct setup for the more complex
ones. I commented these out to fix later, but did not get there
yet. I was getting errors about viewstate.rb using filter_chain
method, so that still need to be resolved. I would not be surpised
if there were a handful of other issues lurking that I did not hit
yet.
As you work through this, here is a possible workflow (and what I
did for reworking Mo's older patchset):
Make whatever changes you need to correct an error, or get to the
next stage of 'working'. Once you are ready to commit, figure out
which existing patches this change should go with. Make an
individual commit for each such grouping of changes. Then
git rebase -i HEAD~<number of changes back to get the fixes you need to alter>
Reorder the commits and squash your additions into the older related
commit. Add your info to the 'edited by' section I added to many of
the patches. Profit.
I suggest the above approach in the interest of keeping the git history
clean, so it can be nicely pushed to master/next when the time comes
(hopefully this means next week).
== WHAT THIS PATCHSET DOESN'T DO ==
* I have not checked for any needed changes in configure yet
* I have not updated the spec files (for things like the new sass rpm)
* I have not fixed spectask deprecations, which I saw when building on f15
* I have not successfully gotten this to build on a stock f15 VM. I altered
my testing repo file so I would get the f14 rpms, but ran into some dep
issues on the VM when I tried to build. I did not experience the same issue
on my laptop. Differences are:
** VM is i686 and stock
** laptop is upgraded from f14 and is x86_64
Remember that I am gone all next week, so if there are any major questions,
please hit me up this afternoon before I go. Good luck :)
-j