Commits · c9470f5c78a782338005138822f0fcf47196ff0d · nexedi / gitlab-ce

03 Nov, 2014 5 commits
- Ability to block commits with certain filenames · c9470f5c
  Valery Sizov authored Nov 03, 2014
  
  c9470f5c
- Merge branch 'sync_ldap_members' into ee-master · da86eace
  Dmitriy Zaporozhets authored Nov 03, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG-EE
```
  da86eace
- Merge branch 'hooks_checkbox' into 'master' · 62ace459
  Dmitriy Zaporozhets authored Nov 03, 2014
```
Git hooks for email checking

https://dev.gitlab.org/gitlab/gitlab-ee/issues/165

https://dev.gitlab.org/gitlab/gitlab-ee/issues/167

See merge request !228
```
  62ace459
- git hook: code style · a7f0160f
  Valery Sizov authored Nov 03, 2014
  
  a7f0160f
- Change comment in gitlab.yml about automatic ldap sync. · 5135b382
  Marin Jankovski authored Nov 03, 2014
  
  5135b382
31 Oct, 2014 5 commits
- update schema · cc34c09e
  Valery Sizov authored Oct 31, 2014
  
  cc34c09e
- updated changelog · fd3109f8
  Valery Sizov authored Oct 31, 2014
  
  fd3109f8
- Git Hook to check whether author is a GitLab member · 76764338
  Valery Sizov authored Oct 31, 2014
  
  76764338
- 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
30 Oct, 2014 4 commits
- Merge branch 'newpkgs' into 'master' · e180e6d5
  Valery Sizov authored Oct 30, 2014
```
Newpkgs

/cc @jacobvosmaer @dzaporozhets

See merge request !227
```
  e180e6d5
- update with new packages for ee · cab8b786
  Job van der Voort authored Oct 30, 2014
  
  cab8b786
- Merge branch '743-pkgs' into 'master' · 610b4e90
  Valery Sizov authored Oct 30, 2014
```
743 pkgs

/cc @valery

See merge request !226
```
  610b4e90
- add 7.4.3-ee packages to list · b6edddf4
  Job van der Voort authored Oct 30, 2014
  
  b6edddf4
29 Oct, 2014 3 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
- Git hooks for checking email · a62ad80a
  Valery Sizov authored Oct 28, 2014
  
  a62ad80a
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 5 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