search

japacible / commission-me

Platform for commissioners and buyers to connect and finalize sales.
http://commissionme.herokuapp.com/
4 stars 3 forks source link

Get heroku synced up with master again #205

Closed kcorman closed 10 years ago

kcorman commented 10 years ago

As I mentioned in #168 and #191 Heroku is out of sync with master. I'm going to try one last time to precompile assets and push, and if not I may have a push coming (code review first) for some changes to the .js files in master's assets.

kcorman commented 10 years ago

Okay, I am now thoroughly convinced that we should just stick to partials.

kcorman commented 10 years ago

Working on this now. Will try to push a branch for code review in a few hours

kcorman commented 10 years ago

@japacible or anyone who understands git fairly well, I've probably made 16 commits to the heroku branch in the past day, and half of them have been reverts (or reverts of reverts). Is this okay, or should I be using rebase instead since presumably I'm the only one messing with heroku? I was pretty sure that rebase is too dangerous to use since I don't understand it thoroughly, but I just wanted to double check. We're going to have some very ugly history on the heroku branch.

japacible commented 10 years ago

It'll be ugly when we try to push master since the branches are out of sync between origin/heroku masters, but other than that, it's ok. We'll need to allocate a lot more time for the final release heroku push to deal with this.

Here's a good visualization for learning about git commands, including what happens when you do a rebase. :)

kcorman commented 10 years ago

Hey, I ended up not rebasing but just doing a frick-ton of reverts. The consequence is that if you were to check out the heroku master branch and merge it with master, everything should be just fine. But if you take master and merge it with heroku (perhaps in an effort to push our master to heroku) it will work, but you're going to add about 28 (rough estimate) weirdo commits to master's commit history. This wouldn't be terrible, but given a choice I'd suggest anyone who wants to push to heroku do it by checking out heroku locally, merging with master from the heroku branch, and then pushing.

quanc commented 10 years ago

How is the status on this?

kcorman commented 10 years ago

I still need to spend some time today fixing up the non javascript assets. I don't anticipate this happening until after 5, since I've got some homework to catch up on before then. I'll be sure to give you all an update by then, though!

On Fri, Dec 6, 2013 at 1:29 PM, Christina Quan notifications@github.comwrote:

How is the status on this?

— Reply to this email directly or view it on GitHubhttps://github.com/japacible/commission-me/issues/205#issuecomment-30031026 .

quanc commented 10 years ago

Thanks @kcorman!

kcorman commented 10 years ago

Okay, heroku seems to be finding all assets now. I changed a few things, but I think what was causing the problem was that we were compiling the assets in the development environment. So when you run rake assets:precompile, you need to actually run rake assets:precompile RAILS_ENV=production

This might actually be the original issue with javascripts too, but I don't want to open that can of worms again. :)

Also, heroku isn't bug free yet. It has the same issue with some javascript not firing, etc. But assets are being found now.

jbrodhacker commented 10 years ago

Great to hear :)