Commits · c6db0e82cdc25bee7eece5b8ddbf8cb6fdc92d32 · nexedi / gitlab-ce

29 Aug, 2014 3 commits
- 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 12 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
- Update version file. · 9e7c7a60
  Marin Jankovski authored Aug 25, 2014
  
  9e7c7a60
- Add to changelog. · a057ba02
  Marin Jankovski authored Aug 25, 2014
  
  a057ba02
- Make LDAP sync time configurable. · a5d7fc81
  Marin Jankovski authored Aug 25, 2014
  
  a5d7fc81
- Merge branch 'ee_feature_steps_documentation' into 'master' · 2f8f0734
  Sytse Sijbrandij authored Aug 25, 2014
```
EE feature steps documentation

Fixes #139

/cc @sytse @jacobvosmaer @job

See merge request !154
```
  2f8f0734
- Add the documentation for ee feature steps. · d9605ad3
  Marin Jankovski authored Aug 25, 2014
  
  d9605ad3
22 Aug, 2014 9 commits
- Merge branch 'packages/7.2' into 'master' · a2fb19de
  Jacob Vosmaer authored Aug 22, 2014
```
Packages for 7.2.0-ee

See merge request !153
```
  a2fb19de
- Add 7.2.0-ee packages · 4be1ddf2
  Jacob Vosmaer authored Aug 22, 2014
  
  4be1ddf2
- Merge branch 'fix/admin_emails_unsubscribe' into 'master' · 24a98ab9
  Jacob Vosmaer authored Aug 22, 2014
```
Fix admin emails unsubscribe

Fixes #151

See merge request !152
```
  24a98ab9
- Fix unsubscribe controller spec. · a8b655a4
  Marin Jankovski authored Aug 22, 2014
  
  a8b655a4
- Update the tests after base change. · 0b9f6c58
  Marin Jankovski authored Aug 22, 2014
  
  0b9f6c58
- Use base 64 encoding for email params. · 9ba563f3
  Marin Jankovski authored Aug 22, 2014
  
  9ba563f3
- Add admin notification unsubscribe feature · b5342de5
  Marin Jankovski authored Aug 22, 2014
  
  b5342de5
- Add admin notification spec. · 93e2e302
  Marin Jankovski authored Aug 22, 2014
  
  93e2e302
- Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq · 6ea702db
  Jacob Vosmaer authored Aug 22, 2014
  
  6ea702db