Skip to content
  • P
    Projects
  • G
    Groups
  • S
    Snippets
  • Help

CIRCLE / cloud

  • This project
    • Loading...
  • Sign in
Go to a project
  • Project
  • Repository
  • Issues 94
  • Merge Requests 10
  • Pipelines
  • Wiki
  • Snippets
  • Members
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Open
Merge request !393 opened Feb 15, 2017 by Czémán Arnold@cemiarni 
  • Report abuse
Report abuse

LDAP and AD authentication

Issues: #477, #478

×

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch origin
git checkout -b issue_477 origin/issue_477

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git checkout master
git merge --no-ff issue_477

Step 4. Push the result of the merge to GitLab

git push origin master

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

  • Discussion 1
  • Commits 11
  • Pipelines 8
  • Changes 8
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Dudás Ádám
    @siliconbrain started a discussion on commit 2ef3e434 Feb 15, 2017
    circle/dashboard/models.py
    401 401 pre_user_save.connect(saml_save_org_id)
    402 402
    403 403
    404 if hasattr(settings, 'LDAP_ORG_ID_ATTRIBUTE'):
    404 if (hasattr(settings, 'LDAP_ORG_ID_ATTRIBUTE') and
    • Dudás Ádám @siliconbrain commented Feb 15, 2017
      Owner

      pro tip:

      if getattr(settings, 'LDAP_ORG_ID_ATTRIBUTE', None):
      Edited Feb 15, 2017 by Dudás Ádám
      pro tip: ```python if getattr(settings, 'LDAP_ORG_ID_ATTRIBUTE', None): ```
    Please register or sign in to reply
  • Czémán Arnold @cemiarni

    added 3 commits

    • 2de30027 - dashboard: Move ldap functions to ldap_utils module
    • 35ae5cdc - dashboard: Rework ldap utils
    • 939fed1d - dashboard: Add ldap support for GroupCodeMixin

    Compare with previous version

    Feb 16, 2017

    added 3 commits

    • 2de30027 - dashboard: Move ldap functions to ldap_utils module
    • 35ae5cdc - dashboard: Rework ldap utils
    • 939fed1d - dashboard: Add ldap support for GroupCodeMixin

    Compare with previous version

    added 3 commits * 2de30027 - dashboard: Move ldap functions to ldap_utils module * 35ae5cdc - dashboard: Rework ldap utils * 939fed1d - dashboard: Add ldap support for GroupCodeMixin [Compare with previous version](https://git.ik.bme.hu/circle/cloud/merge_requests/393/diffs?diff_id=577&start_sha=2ef3e434216fe99c5ffb9f929b48e68f8f5b5d12)
    Toggle commit list
  • Czémán Arnold @cemiarni

    added 1 commit

    • c18cc042 - dashboard: add license for ldap_utils.py

    Compare with previous version

    Feb 16, 2017

    added 1 commit

    • c18cc042 - dashboard: add license for ldap_utils.py

    Compare with previous version

    added 1 commit * c18cc042 - dashboard: add license for ldap_utils.py [Compare with previous version](https://git.ik.bme.hu/circle/cloud/merge_requests/393/diffs?diff_id=578&start_sha=939fed1dbf5220ea3965e0405185a560af9aa57a)
    Toggle commit list
  • Czémán Arnold @cemiarni

    added 4 commits

    • 31419716 - settings: Add extra LDAP group types
    • 20758843 - dashboard: Extend org id support in ldap authentication
    • 5ac2d65c - dashboard: Alter Profile org_id max length to 255
    • 1746ed9a - dashboard: Make switchable the optional ldap imports

    Compare with previous version

    Mar 09, 2017

    added 4 commits

    • 31419716 - settings: Add extra LDAP group types
    • 20758843 - dashboard: Extend org id support in ldap authentication
    • 5ac2d65c - dashboard: Alter Profile org_id max length to 255
    • 1746ed9a - dashboard: Make switchable the optional ldap imports

    Compare with previous version

    added 4 commits * 31419716 - settings: Add extra LDAP group types * 20758843 - dashboard: Extend org id support in ldap authentication * 5ac2d65c - dashboard: Alter Profile org_id max length to 255 * 1746ed9a - dashboard: Make switchable the optional ldap imports [Compare with previous version](https://git.ik.bme.hu/circle/cloud/merge_requests/393/diffs?diff_id=610&start_sha=c18cc04227716d459cc3a0f9ed9fdae50a867d5e)
    Toggle commit list
  • Czémán Arnold @cemiarni

    added 39 commits

    • 1746ed9a...aa92a44d - 38 commits from branch master
    • f8751c29 - Merge branch 'master' into issue_477

    Compare with previous version

    Jul 16, 2018

    added 39 commits

    • 1746ed9a...aa92a44d - 38 commits from branch master
    • f8751c29 - Merge branch 'master' into issue_477

    Compare with previous version

    added 39 commits * 1746ed9a...aa92a44d - 38 commits from branch `master` * f8751c29 - Merge branch 'master' into issue_477 [Compare with previous version](https://git.ik.bme.hu/circle/cloud/merge_requests/393/diffs?diff_id=685&start_sha=1746ed9a29750062752cdb337ccfcf82891d72d0)
    Toggle commit list
  • Czémán Arnold @cemiarni

    added 1 commit

    • 98f1cbe4 - Merge branch 'master' into issue_477

    Compare with previous version

    Jul 16, 2018

    added 1 commit

    • 98f1cbe4 - Merge branch 'master' into issue_477

    Compare with previous version

    added 1 commit * 98f1cbe4 - Merge branch 'master' into issue_477 [Compare with previous version](https://git.ik.bme.hu/circle/cloud/merge_requests/393/diffs?diff_id=686&start_sha=f8751c2993a3cdec769aa4654918d746c86fb9d1)
    Toggle commit list
  • Czémán Arnold @cemiarni

    added 39 commits

    • 98f1cbe4...aa92a44d - 38 commits from branch master
    • c150935a - Merge branch 'master' into issue_477

    Compare with previous version

    Jul 16, 2018

    added 39 commits

    • 98f1cbe4...aa92a44d - 38 commits from branch master
    • c150935a - Merge branch 'master' into issue_477

    Compare with previous version

    added 39 commits * 98f1cbe4...aa92a44d - 38 commits from branch `master` * c150935a - Merge branch 'master' into issue_477 [Compare with previous version](https://git.ik.bme.hu/circle/cloud/merge_requests/393/diffs?diff_id=687&start_sha=98f1cbe4a4776cc24d56b99927ff8fc7ae8f9f5f)
    Toggle commit list
  • Write
  • Preview
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment
Assignee
No assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
0
Labels
None
Assign labels
  • View labels
1
1 participant
Reference: circle/cloud!393