Skip to content

Extend to support GitLab Authentication#118

Merged
jackycute merged 2 commits intohackmdio:masterfrom
jccrofty30:gitlab_authentication
May 15, 2016
Merged

Extend to support GitLab Authentication#118
jackycute merged 2 commits intohackmdio:masterfrom
jccrofty30:gitlab_authentication

Conversation

@jccrofty30
Copy link
Copy Markdown

Commit List:

  • Add necessary dependency.
  • Add baseURL parameter for self-hosted GitLab
  • Add necessary require.
  • Add block for GitLab auth.
  • Fix typo
  • Update font-awesome dependency for GitLab icon.
  • Use a color closer to GitLab orange.
  • More direct TODO

Focus solely on authentication, saving/opening snippets not addressed.

@jccrofty30
Copy link
Copy Markdown
Author

Sorry for open/close/open...wanted to use a more descriptive branch name.

@jackycute
Copy link
Copy Markdown
Member

Hi @jccrofty30 !
Thanks for PR, will merge this soon.

@jccrofty30
Copy link
Copy Markdown
Author

Sure thing! Glad I could contribute.

Add necessary dependency.
Add baseURL parameter for self-hosted GitLab
Add necessary require.
Add block for GitLab auth.
Fix typo
Update font-awesome dependency for GitLab icon.
Use a color closer to GitLab orange.
More direct TODO
@jccrofty30 jccrofty30 force-pushed the gitlab_authentication branch from 0291fbb to a3876df Compare May 12, 2016 01:03
@jccrofty30
Copy link
Copy Markdown
Author

Fixed merge conflicts resulting from most recent updates.

@jackycute
Copy link
Copy Markdown
Member

jackycute commented May 12, 2016

Only one thing you missed right there, the gitlab avatar for user photo url.
https://github.com/hackmdio/hackmd/blob/master/lib/models/user.js#L54

Based on
https://github.com/fh1ch/passport-gitlab2/blob/master/lib/strategy.js#L98
I believe the gitlab user photo url will be profile.avatar_url

@jccrofty30
Copy link
Copy Markdown
Author

I did indeed. Will address in short-order.

@jccrofty30
Copy link
Copy Markdown
Author

Taken care of.

@jackycute jackycute merged commit b96cc4e into hackmdio:master May 15, 2016
jackycute added a commit that referenced this pull request May 15, 2016
@jccrofty30 jccrofty30 deleted the gitlab_authentication branch May 15, 2016 03:06
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.

2 participants