Commits · 85a9feabd67d6403a59d8aa98f52f83b6bd42fea · Kirill Smelkov / gitlab-ce

30 Oct, 2014 2 commits
- Merge branch '7-4-stable' of github.com:gitlabhq/gitlabhq into 7-4-stable · 85a9feab
  Dmitriy Zaporozhets authored Oct 30, 2014
  
  85a9feab
- Add addressable explicitly to Gemfile · 353a9875
  Dmitriy Zaporozhets authored Oct 30, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  353a9875
29 Oct, 2014 7 commits
- update changelog · d52a5c76
  Valery Sizov authored Oct 29, 2014
  
  d52a5c76
- Explicitly require addressable gem feature you need. Fixes Buildbox CI integration · 9de38543
  Dmitriy Zaporozhets authored Oct 29, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  9de38543
- 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
25 Oct, 2014 1 commit
- Merge pull request #8162 from jmsche/patch-1 · 55cf3a5b
  Robert Schilling authored Oct 25, 2014
```
Fixed missing end-of-code line in 7.4 upgrade doc
```
  55cf3a5b
24 Oct, 2014 7 commits
- Fixed missing end-of-code line in 7.4 upgrade doc · 5c74abb5
  jmsche authored Oct 24, 2014
  
  5c74abb5
- 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
- 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
- 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 '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
- 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 12 commits
- Update Guide: Change path to nginx config · be80837a
  Valery Sizov authored Oct 21, 2014
  
  be80837a
- Add test for allowed team name of slack. · 536f61e0
  Marin Jankovski authored Oct 21, 2014
  
  536f61e0
- Use allowed slack team name. · 9f54397f
  Marin Jankovski authored Oct 21, 2014
  
  9f54397f
- remove unnecessary parts from update doc · b1e60cfa
  Valery Sizov authored Oct 21, 2014
  
  b1e60cfa
- Merge branch 'error-messages-fix' into '7-4-stable' · 1ea246f1
  Valery Sizov authored Oct 21, 2014
```
Error messages fix

See merge request !1201
```
  1ea246f1
- Merge pull request #8065 from bbodenmiller/patch-17 · f28df34a
  Valeriy Sizov authored Oct 21, 2014
```
[7.4 rc fix] [doc] clarify when database.yml needs to be updated
```
  f28df34a
- Merge pull request #8066 from bbodenmiller/patch-18 · e73a4eea
  Valeriy Sizov authored Oct 21, 2014
```
[7.4 rc fix] [doc] stop gitlab before mysql optimizations, run checks
```
  e73a4eea
- Merge pull request #8067 from bbodenmiller/patch-19 · 62929caf
  Valeriy Sizov authored Oct 21, 2014
```
[7.4 rc fix] [doc] actually give command necessary to update unicorn
```
  62929caf
- Merge pull request #8070 from bbodenmiller/patch-22 · bc56de15
  Valeriy Sizov authored Oct 21, 2014
```
[7.4 rc fix] [doc] stop gitlab before backup
```
  bc56de15
- Merge pull request #8071 from bbodenmiller/patch-7 · 2dd94657
  Valeriy Sizov authored Oct 21, 2014
```
[7.4 rc fix] [doc] add missing configure Redis to use sockets
```
  2dd94657
- Merge pull request #8072 from bbodenmiller/patch-12 · 39bbf078
  Valeriy Sizov authored Oct 21, 2014
```
[7.4 rc fix] [doc] add optimizations for mysql to 6.x->7.4 guide
```
  39bbf078
- Use :message key, not :error for File::Service. · db5ea013
  Ciro Santilli authored Sep 25, 2014
  
  db5ea013
20 Oct, 2014 5 commits
- Merge branch 'fixes-from-master' into '7-4-stable' · a54d5dc7
  Valery Sizov authored Oct 20, 2014
```
Fixes from master

It includes:

* https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1193
* https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1196
* https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1195

See merge request !1198
```
  a54d5dc7
- Default the LDAP server label to LDAP · 3d3726a0
  Jan-Willem van der Meer authored Oct 17, 2014
  
  3d3726a0
- Prevent redeclaration of LDAP strategy · 49bd9812
  Jan-Willem van der Meer authored Oct 17, 2014
  
  49bd9812
- Add tests for remove group member feature in admin area · 644fd232
  Dmitriy Zaporozhets authored Oct 20, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  644fd232
- Fix group user removal from admin area · ebc0a705
  Dmitriy Zaporozhets authored Oct 20, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  ebc0a705