Commits · d72274bbf2e260c56e77c1cda51aea609adcd8fb · nexedi / gitlab-ce

30 Oct, 2014 1 commit
- Add addressable explicitly to Gemfile · d72274bb
  Dmitriy Zaporozhets authored Oct 30, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  d72274bb
29 Oct, 2014 9 commits
- Merge branch '7-4-stable_non_conflict' into '7-4-stable-ee' · 8df0f692
  Valery Sizov authored Oct 29, 2014
```
7-4-stable CE to EE

See merge request !225
```
  8df0f692
- update changelog · a00cfa19
  Valery Sizov authored Oct 29, 2014
  
  a00cfa19
- Explicitly require addressable gem feature you need. Fixes Buildbox CI integration · 482cdcf4
  Dmitriy Zaporozhets authored Oct 29, 2014
```
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 Oct 29, 2014
```
Conflicts:
	CHANGELOG
	VERSION
```
  1a97c3c4
- Fix raw view for public snippets · 1ab1526d
  Valery Sizov authored Oct 27, 2014
  
  1ab1526d
- Dont allow guests..developers to manage group members · a2dfff41
  Dmitriy Zaporozhets authored Oct 29, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  a2dfff41
- Split group members api · 995d1984
  Dmitriy Zaporozhets authored Oct 29, 2014
```
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 Oct 28, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  43fba7f0
- update changelog && bump version · 912715c3
  Valery Sizov authored Oct 29, 2014
  
  912715c3
24 Oct, 2014 12 commits
- 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
- Merge branch 'fix_internal_snippets' into '7-4-stable' · 477743a1
  Jacob Vosmaer authored Oct 24, 2014
```
Fix internal snippets

See merge request !1216
```
  477743a1
- internal snippets: fix exposing of title · 526b21c4
  Valery Sizov authored Oct 24, 2014
```
Conflicts:
	CHANGELOG
	VERSION
```
  526b21c4
- internal snippets: fix exposing of title · 7f97a127
  Valery Sizov authored Oct 24, 2014
  
  7f97a127
- 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 11 commits
- 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 '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 6 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

Merge branch 'add_doc_to_upgrade_ce_to_ee' into '7-4-stable-ee' · 4e8cc3e1

Valery Sizov authored Oct 21, 2014

Add reference to the README  to upgrade guide CE to EE

Issue - https://dev.gitlab.org/gitlab/gitlab-ee/issues/183

See merge request !213

4e8cc3e1

Add doc for upgrading CE to EE · 6c4c9a8c
Valery Sizov authored Oct 21, 2014

6c4c9a8c
Add instructions for multiple LDAP servers · e88cf107
Jacob Vosmaer authored Oct 21, 2014

e88cf107

Merge branch 'to_ee_stable_from_ce_stable' into '7-4-stable-ee' · 6e23e403

Valery Sizov authored Oct 21, 2014

WIP. CE stable to EE stable

```
Unmerged paths:
  (use "git add <file>..." to mark resolution)

	both modified:   config/initializers/1_settings.rb
	both modified:   config/initializers/7_omniauth.rb
	both modified:   features/admin/groups.feature
	both modified:   features/steps/admin/groups.rb

```

@jacobvosmaer There are 4 conflicts. Two of them (last two ones) I merged by myself. In other cases your help would be appreciated.

See merge request !209

6e23e403