Commits · 61d0bf0badc6de21f7d66be899405d5dc6467b19 · nexedi / gitlab-ce

03 Sep, 2014 4 commits
- Match method order for implementation and class · 61d0bf0b
  Jan-Willem van der Meer authored Sep 03, 2014
```
This will prevent a mess, and keeps everything clean.
In addition i made the non interface methods private
```
  61d0bf0b
- Add extra tests around OAUTH / LDAP find_or_create · 1a59ce4e
  Jan-Willem van der Meer authored Sep 03, 2014
  
  1a59ce4e
- In between patches fixup · f019821d
  Jan-Willem van der Meer authored Sep 03, 2014
  
  f019821d
- Move LDAP tests to proper location · 9d3eb091
  Jan-Willem van der Meer authored Sep 03, 2014
```
Same patch as gitlab-ce
https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1053
```
  9d3eb091
02 Sep, 2014 7 commits
- Merge branch 'doc/ldap_group_links' into 'master' · 1a0c9119
  Job van der Voort authored Sep 02, 2014
```
Documentation for multiple LDAP group links

See merge request !165
```
  1a0c9119
- Add a picture of two linked LDAP groups · 3272d14b
  Jacob Vosmaer authored Sep 02, 2014
  
  3272d14b
- Update documentation with new label text · 48bf72d1
  Jacob Vosmaer authored Sep 01, 2014
  
  48bf72d1
- Point out multiple group links come in 7.3 EE · bd8167b3
  Jacob Vosmaer authored Sep 01, 2014
  
  bd8167b3
- What if the user belongs to multiple LDAP groups? · b9096650
  Jacob Vosmaer authored Sep 01, 2014
  
  b9096650
- Reword feature description for multiple groups · cbe22c9e
  Jacob Vosmaer authored Sep 01, 2014
  
  cbe22c9e
- Update LDAP group screenshots for 7.3 · af10825a
  Jacob Vosmaer authored Sep 01, 2014
  
  af10825a
01 Sep, 2014 1 commit
- Merge branch 'ldap_reset_text' into 'master' · 991ad1f0
  Dmitriy Zaporozhets authored Sep 01, 2014
```
Improve explanation of the LDAP permission reset

See merge request !163
```
  991ad1f0
29 Aug, 2014 5 commits
- Improve explanation of the LDAP permission reset · dbe62c37
  Jacob Vosmaer authored Aug 29, 2014
  
  dbe62c37
- Merge branch 'feature-120-multiple-ldap-groups' into 'master' · 483c0e26
  Jacob Vosmaer authored Aug 29, 2014
```
Add support for multiple LDAP groups per Gitlab group

concerns #120

See merge request !143
```
  483c0e26
- Update db/schema.rb after merging master · c6db0e82
  Jacob Vosmaer authored Aug 29, 2014
  
  c6db0e82
- Merge branch 'master' of dev.gitlab.org:gitlab/gitlab-ee into feature-120-multiple-ldap-groups · 90ce0be4
  Jacob Vosmaer authored Aug 29, 2014
```
Conflicts:
	app/models/group.rb
	app/views/groups/members.html.haml
	db/schema.rb
```
  90ce0be4
- Only return found LDAP groups for processing · 5238efd8
  Jan-Willem van der Meer authored Aug 29, 2014
  
  5238efd8
28 Aug, 2014 3 commits
- Fix version texts for latest packages · a81d806b
  Jacob Vosmaer authored Aug 28, 2014
  
  a81d806b
- Merge branch 'packages/7.2.1' into 'master' · 36613a5a
  Jacob Vosmaer authored Aug 28, 2014
```
Packages for 7.2.1-ee

See merge request !162
```
  36613a5a
- Add packages for GitLab 7.2.1-ee · 0e8f10a7
  Jacob Vosmaer authored Aug 28, 2014
  
  0e8f10a7
27 Aug, 2014 4 commits
- Merge branch 'packages/centos7' into 'master' · 4839d92c
  Jacob Vosmaer authored Aug 27, 2014
```
Add 7.2.0-ee packages for Centos 7

See merge request !161
```
  4839d92c
- Add 7.2.0-ee packages for Centos 7 · 8c6d8b99
  Jacob Vosmaer authored Aug 27, 2014
  
  8c6d8b99
- Merge branch 'unsubscribed_email' into 'master' · 0cbf4788
  Dmitriy Zaporozhets authored Aug 27, 2014
```
Unsubscribed email and doc update

Fixes #152

/cc @jacobvosmaer @job @sytse

See merge request !159
```
  0cbf4788
- Add to changelog. · b51b5d3e
  Marin Jankovski authored Aug 27, 2014
  
  b51b5d3e
26 Aug, 2014 9 commits
- Merge branch 'show_group_sharing_members' into 'master' · ea5bdd84
  Dmitriy Zaporozhets authored Aug 26, 2014
```
Show group sharing members

Fixes #140

/cc @jacobvosmaer @job @sytse

See merge request !158
```
  ea5bdd84
- Add note to documentation. · 49302e68
  Marin Jankovski authored Aug 26, 2014
  
  49302e68
- Add the email templates · 062365ff
  Marin Jankovski authored Aug 26, 2014
  
  062365ff
- Add the feature test · 131277b0
  Marin Jankovski authored Aug 26, 2014
  
  131277b0
- Send email notifying user he has been unsubscribed. · 4b71ae37
  Marin Jankovski authored Aug 26, 2014
  
  4b71ae37
- Move to partial. · 77156c0f
  Marin Jankovski authored Aug 26, 2014
  
  77156c0f
- Add shared group members listing feature. · 704b5b67
  Marin Jankovski authored Aug 26, 2014
  
  704b5b67
- Mockup of shared group memeber list at project member page. · 72139167
  Marin Jankovski authored Aug 26, 2014
  
  72139167
- Merge branch 'ldap_group_sync_hints' into 'master' · b9dc8e59
  Dmitriy Zaporozhets authored Aug 26, 2014
```
Ldap group sync hints

See merge request !157
```
  b9dc8e59
25 Aug, 2014 7 commits
- Rewrite explanation text for ldap group members. · fa1c44ba
  Marin Jankovski authored Aug 25, 2014
  
  fa1c44ba
- Add short explanation on what to expect when doing group sync. · ce6c46e2
  Marin Jankovski authored Aug 25, 2014
  
  ce6c46e2
- Merge branch 'ldap_sync_time_option' into 'master' · 64434261
  Dmitriy Zaporozhets authored Aug 25, 2014
```
Ldap sync time option

Related to #147

/cc @sytse @jacobvosmaer @job

See merge request !155
```
  64434261
- Merge branch 'different_message_when_no_result' into 'master' · e6871279
  Dmitriy Zaporozhets authored Aug 25, 2014
```
Different message when no result is returned on ldap group query

Fixes #103

/cc @sytse @jacobvosmaer @job

See merge request !156
```
  e6871279
- Longer explanation of sync_time option. · 83a919f9
  Marin Jankovski authored Aug 25, 2014
  
  83a919f9
- Advise to refine search when no match is returned. · 1cfe3415
  Marin Jankovski authored Aug 25, 2014
  
  1cfe3415
- End TTD discussion. · 399055db
  Sytse Sijbrandij authored Aug 25, 2014
  
  399055db