Merge branch 'sed_backlog' into 'master'

Sed backlog

See merge request !1117
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Merge branch 'backup-time' into 'master'

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
Decorate commit parents

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Rollback diff drop and set default commit id to HEAD

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Fix wiki

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Fix 'Invalid socket file permissions' error
Fix 500 error on empty search in project

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Fix graphs

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Fix Commit stats and diff encoding issues

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Fix security tests

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Fix satellites

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Fix branch API

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Merge branch 'use-more-rugged' into 'master'

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
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
Merge branch 'add-bugzilla' into 'master'

Add bugzilla

See merge request !1114
Use gitlab_git v7.0.0.rc1

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Improve flash messages

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

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Use 'sed' with pre-search to enable only if present in redis config file.
Path on ubuntu is different