Commits · 5135b3829d76a04eba944be08d6b241de273066f · nexedi / gitlab-ce

03 Nov, 2014 1 commit
- Change comment in gitlab.yml about automatic ldap sync. · 5135b382
  Marin Jankovski authored Nov 03, 2014
  
  5135b382
31 Oct, 2014 2 commits
- Add ldap daily sync to changelog. · f07a5721
  Marin Jankovski authored Oct 31, 2014
  
  f07a5721
- Place the settings that are valid for all ldap servers in a correct place. · e69b5f19
  Marin Jankovski authored Oct 31, 2014
  
  e69b5f19
29 Oct, 2014 2 commits
- Create sidetiq ldap sync worker. · 8a92a1bb
  Marin Jankovski authored Oct 29, 2014
  
  8a92a1bb
- Add time configuration option for LDAP user daily sync. · 80640413
  Marin Jankovski authored Oct 29, 2014
  
  80640413
28 Oct, 2014 1 commit
- Add sidetiq to gemfile. · 51eda1cb
  Marin Jankovski authored Oct 28, 2014
  
  51eda1cb
27 Oct, 2014 2 commits
- Merge branch '7-4-stable-ee-non-conflict' into 'master' · eeeb7da5
  Valery Sizov authored Oct 27, 2014
```
7-4-stable-ee to master. With resolved conflicts

See merge request !222
```
  eeeb7da5
- Merge branch 'ee_master' into 7-4-stable-ee · 9a3d3650
  Valery Sizov authored Oct 27, 2014
```
Conflicts:
	VERSION
```
  9a3d3650
24 Oct, 2014 14 commits
- Merge branch 'packages/7.4.2' into 'master' · 9f8f12b3
  Valery Sizov authored Oct 24, 2014
```
Add 7.4.2-ee packages

See merge request !220
```
  9f8f12b3
- Add 7.4.2-ee packages · 36b68a55
  Jacob Vosmaer authored Oct 24, 2014
  
  36b68a55
- Merge branch 'fix_internal_snippets_ee' into '7-4-stable-ee' · 3f57c97c
  Valery Sizov authored Oct 24, 2014
```
Fix internal snippets

See merge request !219
```
  3f57c97c
- internal snippets: fix exposing of title · 526b21c4
  Valery Sizov authored Oct 24, 2014
```
Conflicts:
	CHANGELOG
	VERSION
```
  526b21c4
- Merge branch 'packages/7.4.1-ee' into 'master' · f40036b4
  Valery Sizov authored Oct 24, 2014
```
Add 7.4.1-ee packages

See merge request !218
```
  f40036b4
- Add 7.4.1-ee packages · b86d15e9
  Jacob Vosmaer authored Oct 24, 2014
  
  b86d15e9
- update changelog · 6adf3bbd
  Valery Sizov authored Oct 24, 2014
  
  6adf3bbd
- Merge branch 'ce_stable' into '7-4-stable-ee' · 9b5fc182
  Valery Sizov authored Oct 24, 2014
```
CE stable to EE

conflict in lib/gitlab/ldap/adapter.rb should be resolved

See merge request !217
```
  9b5fc182
- Fix merge conflict in lib/gitlab/ldap/adapter.rb · 4272926f
  Jacob Vosmaer authored Oct 24, 2014
  
  4272926f
- Merge branch '7-4-stable-ee' into ce_stable · dd559674
  Valery Sizov authored Oct 24, 2014
```
Conflicts:
	VERSION
	lib/gitlab/ldap/adapter.rb
```
  dd559674
- Bump to 7.4.1 · 9712fbcd
  Valery Sizov authored Oct 24, 2014
  
  9712fbcd
- Bump gitlab_git to 7.0.0.rc10 (submodules fix) · d4ae4fe6
  Jacob Vosmaer authored Oct 24, 2014
  
  d4ae4fe6
- Fix LDAP config lookup for provider 'ldap' · 16a10eb1
  Jacob Vosmaer authored Oct 23, 2014
  
  16a10eb1
- fix for public snippet · 5f7906e1
  Valery Sizov authored Oct 24, 2014
  
  5f7906e1
23 Oct, 2014 1 commit
- Fix LDAP authentication for Git HTTP access · e8da077d
  Jacob Vosmaer authored Oct 23, 2014
```
Conflicts:
	CHANGELOG
```
  e8da077d
22 Oct, 2014 15 commits
- Correct header for packages section. · f4e701c0
  Marin Jankovski authored Oct 22, 2014
  
  f4e701c0
- Packages for 7.4.0-ee. · e2d83fbc
  Marin Jankovski authored Oct 22, 2014
  
  e2d83fbc
- Version 7.4.0-ee. · aae4e3f8
  Marin Jankovski authored Oct 22, 2014
  
  aae4e3f8
- Version 7.4.0. · ba76dbc3
  Marin Jankovski authored Oct 22, 2014
  
  ba76dbc3
- Merge branch 'fix-500-login-disabled' into 'master' · dd0198da
  Marin Jankovski authored Oct 22, 2014
```
Fix 500 error on login page if ldap enabled and sign-in disabled

Related to gitlab/gitlabhq#1701

See merge request !1209
```
  dd0198da
- Merge branch 'fix-500-login-disabled' into 'master' · ed00ab75
  Marin Jankovski authored Oct 22, 2014
```
Fix 500 error on login page if ldap enabled and sign-in disabled

Related to gitlab/gitlabhq#1701

See merge request !1209
```
  ed00ab75
- Merge branch 'ce-ee-master' into ee-master · 67d6a79e
  Dmitriy Zaporozhets authored Oct 22, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	VERSION
	config/initializers/1_settings.rb
	config/initializers/7_omniauth.rb
```
  67d6a79e
- Merge branch '7-4-stable-ee' into 'master' · a6a0bb4f
  Dmitriy Zaporozhets authored Oct 22, 2014
```
7-4 stable-ee to master

See merge request !212
```
  a6a0bb4f
- Merge branch 'improve-ldap-check-stable' into '7-4-stable-ee' · 6f8d5819
  Dmitriy Zaporozhets authored Oct 22, 2014
```
Improve ldap check for old syntax [stable]

See merge request !215
```
  6f8d5819
- Make gitlab ldap check work for old and new syntax · d79c5f78
  Dmitriy Zaporozhets authored Oct 22, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  d79c5f78
- Merge branch 'ee-stable-fix-ldap-check' into '7-4-stable-ee' · 86d9a782
  Dmitriy Zaporozhets authored Oct 22, 2014
```
Fix ldap check [stable]

See merge request !214
```
  86d9a782
- Merge branch 'stable-fix-ldap-check' into '7-4-stable' · ba22e3ae
  Dmitriy Zaporozhets authored Oct 22, 2014
```
Fix ldap check [stable]

Fix ldap check for stable branch

See merge request !1208
```
  ba22e3ae
- Fix rake gitlab:ldap:check · 829bd6ff
  Dmitriy Zaporozhets authored Oct 21, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	lib/gitlab/ldap/adapter.rb
```
  829bd6ff
- Make gitlab ldap check work for old and new syntax · 4c034142
  Dmitriy Zaporozhets authored Oct 22, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  4c034142
- Fix rake gitlab:ldap:check · 37e09858
  Dmitriy Zaporozhets authored Oct 21, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  37e09858
21 Oct, 2014 2 commits
- Merge branch '7-4-stable' into 7-4-stable-ee · 348d03b1
  Valery Sizov authored Oct 21, 2014
  
  348d03b1
- Update Guide: Change path to nginx config · be80837a
  Valery Sizov authored Oct 21, 2014
  
  be80837a