Commits · v7.4.5-ee · gitlab-cn / Gitlab

This project is mirrored from https://jihulab.com/gitlab-cn/gitlab.git. Pull mirroring updated 23 minutes ago.

Nov 19, 2014
- Bump VERSION to 7.4.5-ee · 2a216367
  Jacob Vosmaer authored 10 years ago
  
  v7.4.5-ee
  
  2a216367
- Merge branch '7-4-5' into '7-4-stable-ee' · 07707075
  Jacob Vosmaer authored 10 years ago
```
7.4.5

See merge request !247
```
  07707075
- Make AD check server specific · 0c53ffe7
  Jan-Willem van der Meer authored 10 years ago
  
  0c53ffe7
- Merge remote-tracking branch 'ce/7-4-stable-sanitize' into 7-4-stable-ee-sanitize · 6f13d595
  Jacob Vosmaer authored 10 years ago
  
  6f13d595
- Sanitize branch name and ref name · 3a58cc15
  Marin Jankovski authored 10 years ago
```
Conflicts:
	app/controllers/projects/branches_controller.rb
```
  3a58cc15
- Add branch controller test. · 9fb4724e
  Marin Jankovski authored 10 years ago
  
  9fb4724e
- Clean the string with commit author and email. · 1d53d9c7
  Marin Jankovski authored 10 years ago
  
  1d53d9c7
Nov 07, 2014
- update changelog · 150a4f54
  Valery Sizov authored 10 years ago
  
  v7.4.4-ee
  
  150a4f54
- bump version · 406b1e63
  Valery Sizov authored 10 years ago
  
  406b1e63
- Fix broken ldap migration. · b6ac739b
  Marin Jankovski authored 10 years ago
  
  b6ac739b
Oct 30, 2014
- Merge branch '7-4-stable' of github.com:gitlabhq/gitlabhq into 7-4-stable · 85a9feab
  Dmitriy Zaporozhets authored 10 years ago
  
  85a9feab
- Add addressable explicitly to Gemfile · d72274bb
  Dmitriy Zaporozhets authored 10 years ago
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  v7.4.3-ee
  
  d72274bb
- Add addressable explicitly to Gemfile · 353a9875
  Dmitriy Zaporozhets authored 10 years ago
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  v7.4.3
  
  353a9875
Oct 29, 2014
- Merge branch '7-4-stable_non_conflict' into '7-4-stable-ee' · 8df0f692
  Valery Sizov authored 10 years ago
```
7-4-stable CE to EE

See merge request !225
```
  8df0f692
- update changelog · a00cfa19
  Valery Sizov authored 10 years ago
  
  a00cfa19
- update changelog · d52a5c76
  Valery Sizov authored 10 years ago
  
  d52a5c76
- Explicitly require addressable gem feature you need. Fixes Buildbox CI integration · 9de38543
  Dmitriy Zaporozhets authored 10 years ago
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  9de38543
- Explicitly require addressable gem feature you need. Fixes Buildbox CI integration · 482cdcf4
  Dmitriy Zaporozhets authored 10 years ago
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  482cdcf4
- Merge branch '7-4-stable-ee' into 7-4-stable_non_conflict · 1a97c3c4
  Valery Sizov authored 10 years ago
```
Conflicts:
	CHANGELOG
	VERSION
```
  1a97c3c4
- Fix raw view for public snippets · 1ab1526d
  Valery Sizov authored 10 years ago
  
  1ab1526d
- Dont allow guests..developers to manage group members · a2dfff41
  Dmitriy Zaporozhets authored 10 years ago
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  a2dfff41
- Split group members api · 995d1984
  Dmitriy Zaporozhets authored 10 years ago
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  995d1984
- Add failing test that should be green after group members api get fixed · 43fba7f0
  Dmitriy Zaporozhets authored 10 years ago
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  43fba7f0
- update changelog && bump version · 912715c3
  Valery Sizov authored 10 years ago
  
  912715c3
Oct 25, 2014
- Merge pull request #8162 from jmsche/patch-1 · 55cf3a5b
  Robert Schilling authored 10 years ago
```
Fixed missing end-of-code line in 7.4 upgrade doc
```
  55cf3a5b
Oct 24, 2014
- Fixed missing end-of-code line in 7.4 upgrade doc · 5c74abb5
  jmsche authored 10 years ago
  
  5c74abb5
- Merge branch 'fix_internal_snippets_ee' into '7-4-stable-ee' · 3f57c97c
  Valery Sizov authored 10 years ago
```
Fix internal snippets

See merge request !219
```
  v7.4.2-ee
  
  3f57c97c
- Merge branch 'fix_internal_snippets' into '7-4-stable' · 477743a1
  Jacob Vosmaer authored 10 years ago
```
Fix internal snippets

See merge request !1216
```
  v7.4.2
  
  477743a1
- internal snippets: fix exposing of title · 526b21c4
  Valery Sizov authored 10 years ago
```
Conflicts:
	CHANGELOG
	VERSION
```
  526b21c4
- internal snippets: fix exposing of title · 7f97a127
  Valery Sizov authored 10 years ago
  
  7f97a127
- update changelog · 6adf3bbd
  Valery Sizov authored 10 years ago
  
  v7.4.1-ee
  
  6adf3bbd
- Merge branch 'ce_stable' into '7-4-stable-ee' · 9b5fc182
  Valery Sizov authored 10 years ago
```
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 10 years ago
  
  4272926f
- Merge branch '7-4-stable-ee' into ce_stable · dd559674
  Valery Sizov authored 10 years ago
```
Conflicts:
	VERSION
	lib/gitlab/ldap/adapter.rb
```
  dd559674
- Bump to 7.4.1 · 9712fbcd
  Valery Sizov authored 10 years ago
  
  v7.4.1
  
  9712fbcd
- Bump gitlab_git to 7.0.0.rc10 (submodules fix) · d4ae4fe6
  Jacob Vosmaer authored 10 years ago
  
  d4ae4fe6
- Fix LDAP config lookup for provider 'ldap' · 16a10eb1
  Jacob Vosmaer authored 10 years ago
  
  16a10eb1
- fix for public snippet · 5f7906e1
  Valery Sizov authored 10 years ago
  
  5f7906e1
Oct 23, 2014
- Fix LDAP authentication for Git HTTP access · e8da077d
  Jacob Vosmaer authored 10 years ago
```
Conflicts:
	CHANGELOG
```
  e8da077d
Oct 22, 2014
- Version 7.4.0-ee. · aae4e3f8
  Marin Jankovski authored 10 years ago
  
  v7.4.0-ee
  
  aae4e3f8