Commits · 469bc368968099d950a8fb4325c343e6d211c827 · nexedi / gitlab-ce

15 Aug, 2014 2 commits
- Add integration test for new LDAP sync · 469bc368
  Jan-Willem van der Meer authored Aug 15, 2014
  
  469bc368
- Cleanup unused code · 3cd35f05
  Jan-Willem van der Meer authored Aug 15, 2014
  
  3cd35f05
14 Aug, 2014 13 commits
- Support multiple LDAP groups on group members page · fec68ced
  Jan-Willem van der Meer authored Aug 14, 2014
  
  fec68ced
- Refactor group/edit LDAP sync page · e5199638
  Jan-Willem van der Meer authored Aug 14, 2014
  
  e5199638
- Uniform interface to add multiple LDAP connections · 675b8c9d
  Jan-Willem van der Meer authored Aug 14, 2014
  
  675b8c9d
- Add multi-LDAP links to group details page · 68ada955
  Jan-Willem van der Meer authored Aug 14, 2014
  
  68ada955
- Add missing ldap_group_links controller · 08fda6a2
  Jan-Willem van der Meer authored Aug 14, 2014
  
  08fda6a2
- Add uniform ldap group settings to admin and group admin · c5f08ad3
  Jan-Willem van der Meer authored Aug 14, 2014
  
  c5f08ad3
- Fix adding new Ldap links · 4216e948
  Jan-Willem van der Meer authored Aug 14, 2014
  
  4216e948
- Ensure data is complete · 7efb958c
  Jan-Willem van der Meer authored Aug 14, 2014
  
  7efb958c
- Remove old code · bb93dfb2
  Jan-Willem van der Meer authored Aug 14, 2014
  
  bb93dfb2
- Unify naming of LDAP links · d8103cba
  Jan-Willem van der Meer authored Aug 14, 2014
  
  d8103cba
- Add basic layout for multiple ldap groups (admin) · b33e897f
  Jan-Willem van der Meer authored Aug 14, 2014
  
  b33e897f
- Add Gitlab::Access properties to LdapGroupLink · 234ae2e9
  Jan-Willem van der Meer authored Aug 14, 2014
  
  234ae2e9
- Handle multiple LDAP groups · bf65eb1d
  Jan-Willem van der Meer authored Aug 14, 2014
  
  bf65eb1d
13 Aug, 2014 5 commits
- Make ldap_user more explicit in param · 6f71267e
  Jan-Willem van der Meer authored Aug 13, 2014
  
  6f71267e
- Add method to get the current cns the user has access to · 673b9a37
  Jan-Willem van der Meer authored Aug 13, 2014
  
  673b9a37
- Rename ldap_groups to ldap_group_links · b017947a
  Jan-Willem van der Meer authored Aug 13, 2014
  
  b017947a
- Add ldap_groups · b22546df
  Jan-Willem van der Meer authored Aug 13, 2014
  
  b22546df
- Match rails naming convention · 22b0b2b4
  Jan-Willem van der Meer authored Aug 13, 2014
```
Otherwise IDE won't be able to find the tests
```
  22b0b2b4
12 Aug, 2014 6 commits
- Merge branch 'issue-133-custom-jira-issue-transition-id' into 'master' · 361432af
  Dmitriy Zaporozhets authored Aug 12, 2014
```
Issue 133 custom jira issue transition

Fixed #133

![](https://dev.gitlab.org/uploads/gitlab/gitlab-ee/2947f69a9b/Screen_Shot_2014-08-11_at_22.04.35.png)

See merge request !141
```
  361432af
- Merge branch 'gropu-ldap-info' into 'master' · cb5c3625
  Dmitriy Zaporozhets authored Aug 12, 2014
```
Show ldap sync info on group pages

Fixes #141

See merge request !142
```
  cb5c3625
- Better ldap info sentence · 471e183f
  Dmitriy Zaporozhets authored Aug 12, 2014
  
  471e183f
- Add test for jira_issue_transition_id · 196921e5
  Jan-Willem van der Meer authored Aug 12, 2014
  
  196921e5
- Show ldap notice on group member page · ced5d517
  Dmitriy Zaporozhets authored Aug 12, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  ced5d517
- Show group ldap settings on admin/group page · fc16223c
  Dmitriy Zaporozhets authored Aug 12, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  fc16223c
11 Aug, 2014 3 commits
- Add custom jira-issue-transition-id to request · 53d5024b
  Jan-Willem van der Meer authored Aug 11, 2014
  
  53d5024b
- Add jira issue transition id to service form · d048dc26
  Jan-Willem van der Meer authored Aug 11, 2014
  
  d048dc26
- Add transition id to database · 93f49489
  Jan-Willem van der Meer authored Aug 11, 2014
  
  93f49489
29 Jul, 2014 2 commits
- Merge branch '711ee' into 'master' · 005c421f
  Dmitriy Zaporozhets authored Jul 29, 2014
```
711ee

add the 7.1.1-ee packages

See merge request !138
```
  005c421f
- add 7.1.1-ee packages · 53f47353
  Job van der Voort authored Jul 29, 2014
  
  53f47353
28 Jul, 2014 2 commits

Merge branch 'admin_group_edit' into 'master' · 0b79c55f
Dmitriy Zaporozhets authored Jul 28, 2014
```
Fix bug: edit LDAP group settings from admin panel

Fixes #137.

See merge request !136
```
0b79c55f

Fix bug: edit LDAP group settings from admin panel · d092a34f

Jacob Vosmaer authored Jul 28, 2014

The group_params method was filtering out the ldap_cn and ldap_access
attributes when creating/updating a group from the admin interface.

d092a34f

25 Jul, 2014 1 commit
- Merge branch 'jira_docs' into 'master' · c4e3382c
  Sytse Sijbrandij authored Jul 25, 2014
```
Move JIRA setup screenshots inline

See merge request !135
```
  c4e3382c
24 Jul, 2014 1 commit
- Include JIRA setup screenshots with image tags · dcc14b00
  Jacob Vosmaer authored Jul 24, 2014
  
  dcc14b00
23 Jul, 2014 1 commit
- Force encoding to utf8. ruby 1.9 fix · 0696b12f
  Dmitriy Zaporozhets authored Jul 23, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  0696b12f
22 Jul, 2014 4 commits
- Merge branch '710ee' into 'master' · 57e51189
  Sytse Sijbrandij authored Jul 22, 2014
```
710ee

/cc @jacobvosmaer @sytse

See merge request !134
```
  57e51189
- add 7.1.0-ee packages · 4442a20a
  Job van der Voort authored Jul 22, 2014
  
  4442a20a
- Merge branch 'ce-7-1-0' into 'master' · 83ab4236
  Dmitriy Zaporozhets authored Jul 22, 2014
```
Pull CE 7.1.0

See merge request !133
```
  83ab4236
- Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-7-1-0 · 961ea222
  Dmitriy Zaporozhets authored Jul 22, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	VERSION
	app/controllers/projects_controller.rb
```
  961ea222