dj-database-url breaks crash

[scottkleinman]

Latest pull generated a no dj-database-url error. I installed it successfully, but I get "improperly configured: the SECRET_KEY must not be empty", even though it isn't empty in local settings.

[rlskoeser]

sorry, my fault. fix in progress

[rlskoeser]

pushed a version that I think solves the weird config issues, but could be other problems also. can you test and let me know?

[mialondon]

Scott and anyone else pushing changes now, can you jump on gchat to Rebecca or me?

[scottkleinman]

Works, but I lost a lot of changes. I'm pretty sure I've backed up and should be able to re-merge them.

[rlskoeser]

yeah, was afraid we lost changes. want to revert to before the bad merge if that's ok

[mialondon]

When was your last commit?

[mialondon]

Also for Scott, Amy says 'I don't have Scott's IM so can you let him know the new icons are in Visual Identity > Icons and the width needs to be changed in the CSS "img.icons" to 100px.'.

[mialondon]

Scott, were you on a branch or main? It may be that Rebecca's merge just did odd things but you should be able to pull back yours. Is there anything we can look for in the comparison diffs?

[scottkleinman]

Sorry, I haven't used chat on Google before, so I don't know how it works. I won't push anything else tonight whilst things are being sorted. Thanks for passing along Amy's message.

I was on the main branch. There were changes to the base.css, both templates, and I split site_base into two files (the other called view_base) so that we could have two different headers.

[rlskoeser]

I can't fix it properly because I don't have admin on the github repo, but in the interim: please checkout the masterfix branch and make your commits on that. That branch is based on master before the disastrous merge, and it should restore the commits that you lost (please confirm). When I get perms in the morning I'll make sure to use the up-to-date masterfix with any commits to do clean up, and will provide instructions for renaming your branches.

[rlskoeser]

@scottkleinman - just saw you pushed some changes to master. Does that restore the commits I lost in the bad merge?

And is master working fine for you now or are there still issues?

[scottkleinman]

I believe I have restored the changes. There's a minor problem with the styling of the menu (text decoration: underline in the css does not render for some reason), but everything else seems to work. I recommend that you pull the changes I pushed and test.

[rlskoeser]

Thanks @scottkleinman. It looks to me like master is sane again - thanks for reapplying your changes. I'll merge in the code I committed on masterfix last night and once we can confirm in person that we're happy with the repo I'll clean up the masterfix branch.

[scottkleinman]

CSS problem fixed.

[mialondon]

Sounds like this is resolved so I'm very gladly closing this one!

[mialondon]

Hmm, maybe not - the changes I'd made to add the footer and Google Analytics stuff aren't there. It'd be worth checking in with Amanda to see whether she's lost stuff too - though it might relate to Scott's merges rather than the bad merge?

[scottkleinman]

It's my re-merger that did it. It's probably better if I access that code separately and then re-add it. If it's short, can you e-mail it to me or paste it here?

[scottkleinman]

P.S. I am all alone in the Tower. Where is everybody?

[erose]

Coming!

On Fri, Aug 2, 2013 at 8:38 AM, scottkleinman notifications@github.comwrote:

P.S. I am all alone in the Tower. Where is everybody?

— Reply to this email directly or view it on GitHubhttps://github.com/chnm/petulant-adventure/issues/52#issuecomment-22002954 .

[scottkleinman]

I think we can re-close this now.