Commits · 21e8f43af38e20bf99c3e47d01dac9c0f7de3404 · nexedi / gitlab-ce

27 Oct, 2014 1 commit
- Merge branch 'master' into 7-4-stable · 21e8f43a
  Valery Sizov authored Oct 27, 2014
```
Conflicts:
	CHANGELOG
	VERSION
```
  21e8f43a
24 Oct, 2014 13 commits
- Merge branch 'update_patch_doc' into 'master' · 6280b53f
  Sytse Sijbrandij authored Oct 24, 2014
```
Update patch release document

See merge request !1218
```
  6280b53f
- update patch document · 250d582b
  Valery Sizov authored Oct 24, 2014
  
  250d582b
- 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 · 7f97a127
  Valery Sizov authored Oct 24, 2014
  
  7f97a127
- 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
- Merge branch 'bump_gitlab_git' into 'master' · cc42edfa
  Valery Sizov authored Oct 24, 2014
```
Bump gitlab_git to 7.0.0.rc10 (submodules fix)

See merge request !1215
```
  cc42edfa
- 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
- Merge branch 'fix_public_snippets' into 'master' · 8a7b864e
  Marin Jankovski authored Oct 24, 2014
```
Fix public snippets

See merge request !1214
```
  8a7b864e
- Bump gitlab_git to 7.0.0.rc10 (submodules fix) · 2bca5519
  Jacob Vosmaer authored Oct 24, 2014
  
  2bca5519
- Merge branch 'fix_ldap_config_lookup' into 'master' · 8157c6b8
  Marin Jankovski authored Oct 24, 2014
```
Fix LDAP config lookup for provider 'ldap'

See merge request !1213
```
  8157c6b8
- fix for public snippet · 705652d6
  Valery Sizov authored Oct 24, 2014
  
  705652d6
23 Oct, 2014 14 commits
- Fix LDAP config lookup for provider 'ldap' · 472a6621
  Jacob Vosmaer authored Oct 23, 2014
  
  472a6621
- Fix LDAP authentication for Git HTTP access · e8da077d
  Jacob Vosmaer authored Oct 23, 2014
```
Conflicts:
	CHANGELOG
```
  e8da077d
- Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq · 1c1d9f78
  Marin Jankovski authored Oct 23, 2014
  
  1c1d9f78
- Merge branch 'ldap_http_access' into 'master' · 568d6089
  Marin Jankovski authored Oct 23, 2014
```
Fix LDAP authentication for Git HTTP access

See merge request !1211
```
  568d6089
- Fix LDAP authentication for Git HTTP access · 6b2b20af
  Jacob Vosmaer authored Oct 23, 2014
  
  6b2b20af
- Merge branch 'apps-on-website' into 'master' · 30eaf484
  Sytse Sijbrandij authored Oct 23, 2014
```
Apps on website

See merge request !1210
```
  30eaf484
- Merge pull request #8150 from cirosantilli/unecessary-variable-user · 36649fc2
  Robert Schilling authored Oct 23, 2014
```
Remove unused variable user at lib/gitlab/markdown
```
  36649fc2
- Remove unused variable user at lib/gitlab/markdown · 40815b2b
  Ciro Santilli authored Oct 23, 2014
  
  40815b2b
- Merge pull request #8088 from cirosantilli/sh-str-to-args · 90e960f4
  Jacob Vosmaer authored Oct 23, 2014
```
Use argument list for sh instead of string
```
  90e960f4
- Merge pull request #8053 from mr-vinn/fix-rspec-url · 744e11c3
  Robert Schilling authored Oct 23, 2014
```
Fix Rspec error when using non-default port
```
  744e11c3
- Merge pull request #8114 from cirosantilli/rm-global-avatar-js · e80ef19b
  Robert Schilling authored Oct 23, 2014
```
Only run avatar chooser Js on pages that need it
```
  e80ef19b
- Merge pull request #8118 from cirosantilli/user-groups-space-link · e6e5e63c
  Robert Schilling authored Oct 23, 2014
```
Remove whitespace link between user group avatars
```
  e6e5e63c
- link third applications to website · 67047929
  Job van der Voort authored Oct 23, 2014
  
  67047929
- Merge pull request #8139 from cirosantilli/doc-import-md-style · 8fe014e1
  Robert Schilling authored Oct 23, 2014
```
Fix doc raketasts import md style
```
  8fe014e1
22 Oct, 2014 12 commits
- Fix doc raketasts import md style [ci skip] · 5d5b3b82
  Ciro Santilli authored Oct 22, 2014
  
  5d5b3b82
- Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce · c6efa56e
  Dmitriy Zaporozhets authored Oct 22, 2014
  
  c6efa56e
- Merge branch 'fix_milestone_link' into 'master' · 18ba6987
  Dmitriy Zaporozhets authored Oct 22, 2014
```
Fix milestone link in issue page. Closes #174

For a complete description see #174.

See merge request !196
```
  18ba6987
- Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce · ece90366
  Dmitriy Zaporozhets authored Oct 22, 2014
  
  ece90366
- Merge pull request #7994 from cirosantilli/rm-unneeded-autoload-path · 3220e191
  Dmitriy Zaporozhets authored Oct 22, 2014
```
Remove unneeded app/finders config.autoload path
```
  3220e191
- Merge pull request #8026 from HerrBerg/master · ce01916a
  Dmitriy Zaporozhets authored Oct 22, 2014
```
rake:import:repos: fix exclude wiki regex for importing repositories
```
  ce01916a
- Merge pull request #8054 from bbodenmiller/patch-4 · 80e944ac
  Dmitriy Zaporozhets authored Oct 22, 2014
```
match latest config from https://cipherli.st/
```
  80e944ac
- Merge branch 'master' into 'master' · d0296fc9
  Dmitriy Zaporozhets authored Oct 22, 2014
```
fonts: Added "DejaVu Sans Mono" and "Ubuntu Mono"

Everything is better than "Courier New" ...

See merge request !210
```
  d0296fc9
- Version 7.4.0. · ba76dbc3
  Marin Jankovski authored Oct 22, 2014
  
  ba76dbc3
- 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 'fix-500-login-disabled' into 'master' · 5e2a1c14
  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
```
  5e2a1c14
- Fix 500 error on login page if ldap enabled and sign-in disabled · b0ef23c1
  Dmitriy Zaporozhets authored Oct 22, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  b0ef23c1