Skip to content

Conversation

@kjetilk
Copy link
Member

@kjetilk kjetilk commented Oct 16, 2018

This should implement #823 and also address (at least partially) the bug in solid/solid#205 by downcasing usernames on submition.

Copy link
Contributor

@RubenVerborgh RubenVerborgh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The explanation is clear.
There's just something wrong with the commit sequence; needs rebase.

@kjetilk
Copy link
Member Author

kjetilk commented Oct 16, 2018

Right. It is just that stuff seems to happen every time I rebase, and I end up having to do a merge anyway...

@RubenVerborgh
Copy link
Contributor

@kjetilk Ping me if I can help.

@kjetilk
Copy link
Member Author

kjetilk commented Oct 16, 2018

Yup, I will @RubenVerborgh , just need to investigate a bit more myself, to see if I understand the pain point.

BTW, the Snyk failure, is there something we could cherry-pick for that?

@RubenVerborgh
Copy link
Contributor

@kjetilk Just a rebase on develop will do. The following should work:

git fetch
git checkout fix-username-docs
git rebase -i origin/develop

Then pick only the commits you need.

@kjetilk
Copy link
Member Author

kjetilk commented Oct 16, 2018

OK, so perhaps this is what happened: I merged the 5.0.0 branch into it...? If so, that was certainly an accident. I probably meant to merge develop into the 5.0.0 at that point.

Anyway, let me see if I can rebase it successfully with that understanding.

@kjetilk
Copy link
Member Author

kjetilk commented Oct 16, 2018

OK, so how about now?

Copy link
Contributor

@RubenVerborgh RubenVerborgh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Maybe squash merge?

@kjetilk kjetilk merged commit c17b195 into develop Oct 16, 2018
@kjetilk
Copy link
Member Author

kjetilk commented Oct 16, 2018

OK, I usually look at commits as the gory details, but let me do that to experience the difference :-)

@kjetilk kjetilk deleted the fix-username-docs branch October 16, 2018 15:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants