Authenticate LDAP users in the grack module #2557

Closed
wants to merge 2 commits into
from

Conversation

6 participants
@jasl8r

jasl8r commented Jan 10, 2013

This resolves issue #2012.

I had suggested some options in the original pull request for this issue, but in the end I used the omniauth-ldap module directly to perform the authentication. This does two things, it keeps the code in the grack_auth module simpler, and it ensures that any LDAP repository and settings working with devise and the main site should work here.

Merge branch 'master' into ldap_grack_auth
Conflicts:
	lib/gitlab/backend/grack_auth.rb
@raphendyr

This comment has been minimized.

Show comment
Hide comment
@raphendyr

raphendyr Feb 2, 2013

Contributor

Is there way to do more on omniauth provider side? Consider that shibboleth and pam will want to do them same, so more generalized code might be nicer.

Contributor

raphendyr commented Feb 2, 2013

Is there way to do more on omniauth provider side? Consider that shibboleth and pam will want to do them same, so more generalized code might be nicer.

@kvaggelakos

This comment has been minimized.

Show comment
Hide comment
@kvaggelakos

kvaggelakos Feb 6, 2013

Tried this out and seems to work! Well done 👍

Tried this out and seems to work! Well done 👍

@adolfomaltez

This comment has been minimized.

Show comment
Hide comment
@adolfomaltez

adolfomaltez Feb 26, 2013

Works for me.
Thanks.

Works for me.
Thanks.

@bawoodruff

This comment has been minimized.

Show comment
Hide comment
@bawoodruff

bawoodruff Feb 27, 2013

Applied to 4.2-stable and verified in my config using LDAP w/ Active Directory. Thanks for the patch!

Applied to 4.2-stable and verified in my config using LDAP w/ Active Directory. Thanks for the patch!

@sodabrew

This comment has been minimized.

Show comment
Hide comment
@sodabrew

sodabrew Mar 4, 2013

Contributor

@jasl8r Rather than merge master into your branch, could you rebase your branch up to master?

+1 for more generalized handling of all OmniAuth providers if possible.

Contributor

sodabrew commented Mar 4, 2013

@jasl8r Rather than merge master into your branch, could you rebase your branch up to master?

+1 for more generalized handling of all OmniAuth providers if possible.

@jasl8r jasl8r closed this Mar 4, 2013

@jasl8r jasl8r reopened this Mar 4, 2013

@jasl8r jasl8r closed this Mar 4, 2013

stanhu added a commit that referenced this pull request Oct 7, 2015

Add directory feature button
Change "+" icon under "Files" section to have three options:

* Create file
* Upload file
* New directory

Upload file is no longer accessible from the "Create file" page.
Users can now select a target branch in upload file as well.

Closes #2799: Fixes a bug where file modes were overwritten after a commit

Closes https://github.com/gitlabhq/gitlabhq/issues/8253: Existing files
can no longer be overwritten in the "Create file" section.

Closes #2557

DouweM added a commit that referenced this pull request Oct 7, 2015

Merge branch 'add-directory-feature' into 'master'
Add directory feature button

This MR adds the "Add directory" feature as described in #2557 and splits out the "Create file" and "Upload file" in a dropdown.

### Screenshots

![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/098b77026508eef222e0f93ec78f34ec/image.png)

![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/93588b0280ffa2bd44603193feac5bdf/image.png)

![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/9094a63d41d7cb33e103390545c9c146/image.png)

Added branch capability to upload file form:

![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/9b3c012a3f2333a5db0e2ceb8e6711ec/image.png)

"Upload file" is no longer accessible from the "Create file" page. Users can now select a target branch in upload file as well.
   
Closes #2799: Fixes a bug where file modes were overwritten after a commit
    
Closes https://github.com/gitlabhq/gitlabhq/issues/8253: Existing files can no longer be overwritten in the "Create file" section.
    
Closes #2557 

See merge request !1453
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment