Commits · 2a42030a8cdf6f94092cdbde630b853f214f4fe4 · nexedi / gitlab-ce

12 Aug, 2013 3 commits
- Version to 6.0.0-ee.beta · 2a42030a
  Dmitriy Zaporozhets authored Aug 12, 2013
  
  2a42030a
- Replace license to MIT in EE files · 541e70d8
  Dmitriy Zaporozhets authored Aug 12, 2013
  
  541e70d8
- LiCENSE to MIT · f2bfda9b
  Dmitriy Zaporozhets authored Aug 12, 2013
  
  f2bfda9b
10 Aug, 2013 1 commit
- do ldap access check only if current_user defined · f8475f73
  Dmitriy Zaporozhets authored Aug 10, 2013
  
  f8475f73
09 Aug, 2013 3 commits
- Do ldap permissions update every hour · 99efbc8c
  Dmitriy Zaporozhets authored Aug 09, 2013
  
  99efbc8c
- Fixed group tests · cd786519
  Dmitriy Zaporozhets authored Aug 09, 2013
  
  cd786519
- ldap_access field added to group. set ldap group membership based on ldap_access value · 915315a4
  Dmitriy Zaporozhets authored Aug 09, 2013
  
  915315a4
05 Aug, 2013 3 commits
- Merge branch 'feature/ldap_groups' of /home/git/repositories/gitlab/gitlab-ee · 721758e8
  Dmitriy Zaporozhets authored Aug 05, 2013
  
  721758e8
- Update ldap user permissions on each login · 073e8b67
  Dmitriy Zaporozhets authored Aug 05, 2013
  
  073e8b67
- Add/remove user to appropriate groups based on LDAP settings · 7fe779b8
  Dmitriy Zaporozhets authored Aug 05, 2013
  
  7fe779b8
02 Aug, 2013 1 commit
- Add ldap_cn field to Group · 4b3fa67c
  Dmitriy Zaporozhets authored Aug 02, 2013
  
  4b3fa67c
31 Jul, 2013 2 commits
- We can collect user groups now · 2c8ee981
  Dmitriy Zaporozhets authored Jul 31, 2013
  
  2c8ee981
- Gitlab::LDAP - ability to collect group members · 7ba37d86
  Dmitriy Zaporozhets authored Jul 31, 2013
  
  7ba37d86
30 Jul, 2013 1 commit
- Add LDAP::Group and LDAP::Person classes. Create LDAP module. Added method for selecting ldap users · 1e9b2733
  Dmitriy Zaporozhets authored Jul 30, 2013
  
  1e9b2733
29 Jul, 2013 3 commits
- Add license file to lib/ldap · 51d5364a
  Dmitriy Zaporozhets authored Jul 29, 2013
  
  51d5364a
- Add group base to config. Join auth options only if provided · 07de7bca
  Dmitriy Zaporozhets authored Jul 29, 2013
  
  07de7bca
- Implement ldap group search functionality · f9f1649f
  Dmitriy Zaporozhets authored Jul 19, 2013
  
  f9f1649f
19 Jul, 2013 3 commits
- Merge branch 'master' of dev.gitlab.org:gitlab/gitlab-ee · fc6e2cdb
  Dmitriy Zaporozhets authored Jul 19, 2013
```
Conflicts:
	app/views/groups/_projects.html.haml
```
  fc6e2cdb
- schema.rb · 3ac5a759
  Dmitriy Zaporozhets authored Jul 19, 2013
  
  3ac5a759
- Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq · 3f559cc9
  Dmitriy Zaporozhets authored Jul 19, 2013
```
Conflicts:
	app/views/help/index.html.haml
```
  3f559cc9
18 Jul, 2013 20 commits
- Doc for update from 5.3 to 5.4 · d3c429ed
  Dmitriy Zaporozhets authored Jul 18, 2013
  
  d3c429ed
- Merge branch 'nginx_alternatives_in_recipes' of /home/git/repositories/gitlab/gitlabhq · 4f65509c
  Dmitriy Zaporozhets authored Jul 18, 2013
  
  4f65509c
- Merge pull request #4289 from karlhungus/feature-ldap-signin-with-email-or-username · da07665b
  Dmitriy Zaporozhets authored Jul 18, 2013
```
Allow the ldap logins with email or username
```
  da07665b
- Refer to recipes for nginx alternatives · d3e94eef
  Jacob Vosmaer authored Jul 18, 2013
  
  d3e94eef
- Default allow username or email login to false · d04f3286
  Izaak Alpert authored Jul 11, 2013
```
-If not specified in the gitlab.yml default this setting to false

Change-Id: I3551df364498dd84ccbd18c90797522e77159f05
```
  d04f3286
- Update the proc/lamda to be consistent · 1a31cb2c
  Izaak Alpert authored Jun 26, 2013
```
Change-Id: I411c7544c7834b00d26e51dc9a6c0396c51bd4f3
```
  1a31cb2c
- Allow the ldap logins with email or username · 089605fe
  Izaak Alpert authored Jun 11, 2013
```
Change-Id: I73b4aa4c46afd56ae02fb24abcd673c0724547e4
```
  089605fe
- Merge branch 'improve/snippets' of /home/git/repositories/gitlab/gitlabhq · 2c191ab0
  Dmitriy Zaporozhets authored Jul 18, 2013
  
  2c191ab0
- Fix tests · 98e1597f
  Dmitriy Zaporozhets authored Jul 18, 2013
  
  98e1597f
- Merge branch 'master' of github.com:gitlabhq/gitlabhq · 4a72f5d8
  Dmitriy Zaporozhets authored Jul 18, 2013
  
  4a72f5d8
- Revert "Update installation.md" · afa1a20d
  Ariejan de Vroom authored Jul 18, 2013
```
This reverts commit 670e1be7.
```
  afa1a20d
- Revert "Update installation.md" · 2d9bbe66
  Ariejan de Vroom authored Jul 18, 2013
```
This reverts commit b5cd66d4.
```
  2d9bbe66
- Use gitlab-shell authorized_keys truncation. Fix issue with authorized_keys... · 475f607a
  Dmitriy Zaporozhets authored Jul 18, 2013
```
Use gitlab-shell authorized_keys truncation. Fix issue with authorized_keys stored in different location
```
  475f607a
- User links to user snippets · 33347efa
  Dmitriy Zaporozhets authored Jul 18, 2013
  
  33347efa
- Merge pull request #4564 from mpwoodward/patch-2 · 4b47a58f
  Ariejan de Vroom authored Jul 18, 2013
```
Update installation.md
```
  4b47a58f
- Merge pull request #4563 from mpwoodward/patch-1 · 5a5d34e2
  Ariejan de Vroom authored Jul 18, 2013
```
Update installation.md
```
  5a5d34e2
- Merge pull request #4583 from szicari-cars/master · 033abfca
  Ariejan de Vroom authored Jul 18, 2013
```
Updated README.md
```
  033abfca
- Minor ui fix for snippet · 82e1fe46
  Dmitriy Zaporozhets authored Jul 18, 2013
  
  82e1fe46
- Improve UI for project snippets · b1fbd658
  Dmitriy Zaporozhets authored Jul 18, 2013
  
  b1fbd658
- Add seeds and improve ui. Remove snippet expires_at · bbb06e50
  Dmitriy Zaporozhets authored Jul 18, 2013
  
  bbb06e50