Okay, so we fixed our git, now we're just waiting on the site to get back up, and we can reimplement.

HOPEFULLY everyone's stuff stayed, if not, we'll figure it out tbh

@spiderrobotpig Did yall get everything worked out?

@krainboltgreene Just about, right now apparently we're dealing with come commit issues, so we'll take care of that.

95% sure we know what it is tbh

@spiderrobotpig Alright, cool. Well if you hit any other issues please feel free to contact me. I can definitely help.

@krainboltgreene Thanks :3

The other (much better) sysadmin is online and we're getting it figured out. We're missing app/views/about/index.html.haml but it seems like the main masto instance is also missing that in github so no idea rn

@spiderrobotpig Yep, that's because there's nothing pointing to it: https://github.com/tootsuite/mastodon/blob/master/config/routes.rb#L186

Is your application expecting it to be there?

@krainboltgreene It was something else being weird haha

Thought we had modified it once, but none of our instances have had that one.

Right now we're wrangling a broken database, so it looks like we're just gonna start fresh

@spiderrobotpig How's it going, any better?

@krainboltgreene not really?

About/more won't load and when we log in, it's just blank.

@krainboltgreene also, the other admin is at a loss, so we're thinking about just implementing 1.2 w/o the whitelisting, but we are having issues figuring out how to do that tbh

@spiderrobotpig If I can get more info I can help.

@krainboltgreene what do you need to know?

@spiderrobotpig Is the error reproducible and if so can you tell me how to reproduce it?

@krainboltgreene not that we know of, because there's no error

@spiderrobotpig What's the url?

@krainboltgreene witches.academy. It'll let you make an account, and it sends the message, but when you log in it's just a blank screen

@spiderrobotpig Try this: https://github.com/tootsuite/mastodon/issues/2010#issuecomment-294524012

@krainboltgreene Nope :< Same issue

@spiderrobotpig I believe it to be the root cause. How did you deploy your application?

@krainboltgreene That's handled by the other admin so we're not entirely sure.

Postgres we believe? Unless that's the wrong thing.

And we aren't sure what you mean the i18n stuff

@spiderrobotpig Can you all direct me to the other admin? Maybe message me in the mastodon discord?

@krainboltgreene Didn't know there was one, also they aren't feeling really well, so we're trying to figure it out in the meantime.

No worries, we'll get it eventually >.> Just another day gone.

@spiderrobotpig Okay. I've brought the issue to Gargron's attention. We're looking into it and I'll let you know as soon as we have something actionable.

Until then if we could get communication between me and your other admin that would help a lot. So let me know when they feel better.

@krainboltgreene Okay :3

If it helps, when we run git status, we get a really long list of new files but no way to commit thiem?

@spiderrobotpig Okay, yes that's definitely a thing. Can you put the output (entire) of `git status` into a gist.github.com and link me?

@krainboltgreene If you can tell us the commands to run, we can do it. But it overloads our termial so we can't copy/paste

@spiderrobotpig Okay, so I'm thinking this through. What you've encountered is one of a few things.

Did yall git pull and then suddenly you had these issues?

@krainboltgreene No, so here's the run down.

We had some help installing awoo.space's whitelist stuff. Then we upgraded to 1.2, which goofed the whitelist, but then we messed up federation. Then someone suggested we move it and try a reinstall to see if we could get it working. We somehow managed to break it.

So, then the other admin set it up again, and we set up the whitelist stuff again, and now we're stuck where we are.

We honestly want to just roll back at this point and just go back to the domain blocking, but we can't even get that to work correctly :<

@spiderrobotpig Okay, that's a lot of movement. So the immediate thing you can do is figure out what state git is currently in. It's either in a rebase resolution state, merge resolution state, or just with a lot of changes.

We're going to use the `less` command to figure out where. Less takes a lot of output and "paginates" it. Run this: `git status | less`.

@krainboltgreene

On branch master
Your branch is up-to-date with 'origin/master'.
Changes to be committed:
(use "git reset HEAD <file>..." to unstage)

And then just a shitton of new files

@spiderrobotpig Okay, awesome. So that tells us we're not in any special state and we just have a lot of changes. If these are changes you care about, changes you've made to the source, then we need to commit those. I'm guessing not, and so here's what we'll do: `git add . && git stash add -m "Figure out this later"`

This:

1. Adds all changes to the staging area.
2. Stashes all of those staging area changes into a special place out of the way. We can bring it back if we need.

@krainboltgreene It won't let us stash >.>

@spiderrobotpig What's it say?

@krainboltgreene

usage: git stash list [<options>]
or: git stash show [<stash>]
or: git stash drop [-q|--quiet] [<stash>]
or: git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]
or: git stash branch <branchname> [<stash>]
or: git stash [save [--patch] [-k|--[no-]keep-index] [-q|--quiet]
[-u|--include-untracked] [-a|--all] [<message>]]
or: git stash clear
mastodon@witches-academy

@spiderrobotpig Woops, my bad run: `git stash save "Figure this out later"`

@krainboltgreene Okay, got it stashed

@spiderrobotpig Okay, now run those commands from that github issue and restart your instance.

@krainboltgreene Still just a blank screen

@spiderrobotpig Alright, so we've got a clean slate (`git status` is clear) and we've precompiled all our assets on the server (those commands from the github issue), correcT?

@krainboltgreene Sort of.

Now we're getting this on git status

Your branch is up-to-date with 'origin/master'.
Untracked files:
(use "git add <file>..." to include in what will be committed)

vendor/bundle/

nothing added to commit but untracked files present (use "git add" to track)

Which is probably the isue, but if we run that gain, we'll end up where we were previously

@spiderrobotpig Can yall show me yalls remotes? `git remote -v`

@krainboltgreene origin https://github.com/Witches-Academy/mastodon.git (fetch)
origin https://github.com/Witches-Academy/mastodon.git (push)

That's what we got :3

@spiderrobotpig Ah-ha! Okay, so lets add an upstream:

https://gist.githubusercontent.com/krainboltgreene/d644c6840cc01f99ae2bd99672c5def2/raw/9adca78e914fd49164cbb383242427af698eb89d/gistfile1.txt

@krainboltgreene Oki, that's added and showing up in our git remote -v

@spiderrobotpig Perfect, okay now the tricky part. Lets get the latest from mastodon. I want to warn you, there's no guarantee this works. We may have to roll back what we're about to do. Is that OK?

@krainboltgreene Totally fine with us tbh

@spiderrobotpig Okay, lets do this: `git pull upstream master`

@krainboltgreene That did something. then just run the codes again?