Commits · 8f0551de05e84b95c06f14db9271f8f5edb80c6c · iv / gitlab-ce

25 Sep, 2014 27 commits
- Merge branch 'master' into 'master' · 8f0551de
  Jacob Vosmaer authored Sep 25, 2014
```
Small documentation update, add unixsocketperm

If you run gitlab as user ``git`` while redis runs as user ``redis`` and you add git to ``redis`` group, you'll need to set ``unixsocketperm = 0775`` to grant write access to group.

See merge request !192
```
  8f0551de
- Merge branch 'improve-flash-message' into 'master' · 5040dbfb
  Dmitriy Zaporozhets authored Sep 25, 2014
```
Improve flash message

* dont fadeout so user can read
* show inside content block so user can notice it

See merge request !1119
```
  5040dbfb
- Small improvements to code rendering for white highlight · 8ebe769f
  Dmitriy Zaporozhets authored Sep 25, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  8ebe769f
- Remove obsolete line · 99e5e6db
  Daniel Widerin authored Sep 25, 2014
  
  99e5e6db
- Use edit in place with sed instead of tee · 16a6d245
  Daniel Widerin authored Sep 25, 2014
  
  16a6d245
- Path on ubuntu is different · d5dc171c
  Daniel Widerin authored Sep 25, 2014
  
  d5dc171c
- Use 'sed' with pre-search to enable only if present in redis config file. · b874cb21
  Daniel Widerin authored Sep 25, 2014
  
  b874cb21
- Improve flash messages · 20d6f969
  Dmitriy Zaporozhets authored Sep 25, 2014
```
* dont fadeout so user can read
* show inside content block so user can notice it
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  20d6f969
- Use gitlab_git v7.0.0.rc1 · a6b4e371
  Dmitriy Zaporozhets authored Sep 25, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  a6b4e371
- Merge branch 'add-bugzilla' into 'master' · 86875577
  Dmitriy Zaporozhets authored Sep 25, 2014
```
Add bugzilla

See merge request !1114
```
  86875577
- Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce · ab729e5c
  Dmitriy Zaporozhets authored Sep 25, 2014
  
  ab729e5c
- Merge branch 'use-more-rugged' into 'master' · 3a72af48
  Dmitriy Zaporozhets authored Sep 25, 2014
```
Make GitLab CE works with new gitlab_git

Recently we removed grit dependency from `gitlab_git` in favor of rugged.

This changes make GitLab works with new library.

See merge request !194
```
  3a72af48
- Fix branch API · eaeb4a90
  Dmitriy Zaporozhets authored Sep 25, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  eaeb4a90
- Fix satellites · 66ef5c1a
  Dmitriy Zaporozhets authored Sep 25, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  66ef5c1a
- Fix security tests · 3bf316db
  Dmitriy Zaporozhets authored Sep 25, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  3bf316db
- Fix Commit stats and diff encoding issues · 619c81b4
  Dmitriy Zaporozhets authored Sep 25, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  619c81b4
- Fix graphs · 3a106cbc
  Dmitriy Zaporozhets authored Sep 25, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  3a106cbc
- Fix 500 error on empty search in project · 424b42d6
  Dmitriy Zaporozhets authored Sep 25, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  424b42d6
- Fix 'Invalid socket file permissions' error · 18adc4f6
  Daniel Widerin authored Sep 25, 2014
  
  18adc4f6
- Fix wiki · 4b65b0e0
  Dmitriy Zaporozhets authored Sep 25, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  4b65b0e0
- Rollback diff drop and set default commit id to HEAD · b13c1469
  Dmitriy Zaporozhets authored Sep 25, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  b13c1469
- Decorate commit parents · 3695ae18
  Dmitriy Zaporozhets authored Sep 25, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  3695ae18
- Merge branch 'backup-time' into 'master' · b0a4ec5e
  Jacob Vosmaer authored Sep 25, 2014
```
Backup time

The suggested backup time conflicts with daylight savings time, which occurs between 1-3am, causing the backup either to be skipped or ran twice.

See merge request !1118
```
  b0a4ec5e
- Merge branch 'master' of github.com:gitlabhq/gitlabhq · 9cd5ff04
  Jacob Vosmaer authored Sep 25, 2014
  
  9cd5ff04
- Merge branch 'sed_backlog' into 'master' · 475c554f
  Jacob Vosmaer authored Sep 25, 2014
```
Sed backlog

See merge request !1117
```
  475c554f
- set the proposed backup time to 4am · 4ed5a506
  Job van der Voort authored Sep 25, 2014
  
  4ed5a506
- Fix the sed command for increasing the backlog · b268fa05
  Jacob Vosmaer authored Sep 25, 2014
  
  b268fa05
24 Sep, 2014 13 commits
- Merge pull request #7847 from axilleas/doc_install_redis · abab92dc
  Robert Schilling authored Sep 24, 2014
```
Add missing Redis item list in installation.md#overview
```
  abab92dc
- Add missing Redis item list in Overview [ci skip]. · 05b535e1
  Achilleas Pipinellis authored Sep 24, 2014
  
  05b535e1
- New entries for 7.4.0 · 2aeac794
  Dmitriy Zaporozhets authored Sep 24, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  2aeac794
- Fix creating new file via web editor · 64a2afd3
  Dmitriy Zaporozhets authored Sep 24, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  64a2afd3
- Fix non-showing error message when edit file via web · 184e0f8d
  Dmitriy Zaporozhets authored Sep 24, 2014
  
  184e0f8d
- Improve diff and bump gitlab_git revision · 13aec952
  Dmitriy Zaporozhets authored Sep 24, 2014
  
  13aec952
- Merge branch 'gitlab_ldap_filter' into 'master' · de717a33
  Sytse Sijbrandij authored Sep 24, 2014
```
Add more LDAP user_filter documentation

See merge request !1115
```
  de717a33
- Add more LDAP user_filter documentation · 532eff61
  Jacob Vosmaer authored Sep 24, 2014
  
  532eff61
- Add unixsocketperm note to upgrade guide · d3dbd353
  Daniel Widerin authored Sep 24, 2014
  
  d3dbd353
- Use new version of gitlab_git with extended rugged usage · 53f2130e
  Dmitriy Zaporozhets authored Sep 24, 2014
  
  53f2130e
- Merge pull request #7823 from cirosantilli/test-fetch-shell · 28b6f09f
  Dmitriy Zaporozhets authored Sep 24, 2014
```
Only clone GitLab Shell on tests if necessary.
```
  28b6f09f
- Merge pull request #7820 from skv-headless/move_blame_to_rugged · 0b7377d8
  Dmitriy Zaporozhets authored Sep 24, 2014
```
blame with rugged
```
  0b7377d8
- Add bugzilla to list because people ask about it. · 41cfdd25
  Sytse Sijbrandij authored Sep 24, 2014
  
  41cfdd25