in the software release:
  - gitlab-ce,
  - gitlab-workhorse,
  - gitlab-shell repositories

Like for ab578df5.

    $ git diff origin/8-8-stable origin/8-9-stable -- \
      files/gitlab-cookbooks/gitlab/templates/default/sv-sidekiq-run.erb

in omnibus-gitlab repository is empty.

Like for de35c7da.

I've manually reviewed:

    git diff origin/8-8-stable origin/8-9-stable  -- files/gitlab-config-template/gitlab.rb.template \
                                                     files/gitlab-cookbooks/gitlab/attributes/default.rb

on omnibus-gitlab repository.

    This does almost only pure merge. We will slaposify / adjust config
    and corresponding md5sum in the following patches.

Conflicts:
	software/gitlab/template/gitlab.yml.in
	software/gitlab/template/nginx.conf.in

    Like 5e227fdb - pristine copy from omnibus-gitlab 8-9-stable 5eb2711e

    Changes are:

        - gitlab.yml.erb
          Add cron gitlab.yml configuration.

        - nginx.conf.erb
          Make the server names nginx hash size configurable

        - smtp_settings.rb.erb
          Set ActionMailer::Base.delivery_method to SMTP to make mail work

    The following files stay the same:

        - database.yml.erb
        - gitconfig.erb
        - gitlab-shell-config.yml.erb
        - nginx-gitlab-http.conf.erb
        - rack_attack.rb.erb
        - resque.yml.erb
        - unicorn.rb.erb

The watcher should also watch for signals like SIGTERM killing sidekiq, which
are trapped by sidekiq, with sidekiq exiting successfully (with exit code 0).

To achieve this we rework our watcher-sigkill to be a generic watcher -
that can be given a set of restart exit codes including signal names and
monitors whether child process terminated with matching for restart exit
code.

Example usage:

	watcher 0,SIGKILL prog ...

Based on patch by @iv.
Discussion: https://lab.nexedi.com/lab.nexedi.com/lab.nexedi.com/issues/25#note_22085

Also allow to change promise timeout by editing check_url_PROMISE_TIMEOUT file

An issue on Gitlab SR when pushing on protected branches occurs with git 2.11.
Gitlab issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/25601

Fixes: https://lab.nexedi.com/lab.nexedi.com/lab.nexedi.com/issues/37

Getting them from the runner backup avoids to get false positive if some
of the instance's backup files were excluded using an exporter.exclude file

In prevision for gitlab-backup restore to be done in a script. In fact, it requires `sed` command to be available.
We have to add /bin to the PATH as `which sed` returns `/bin/sed`.

# Upgrade

    * GitLab Software + patches ported to GitLab 8.8.9;
    * Configs synced with upstream and SlapOS-ified;
    * Fix promises due to curl upgrade

@jerome @kazuhiko @kirr: if you have any comments, I would be glad to read them. There is a [demo instance](https://softinst69126.host.vifib.net) you can try.

Check on the demo instance for the Gitlab configuration:

- [x] migrations are all `up`, when running: `gitlab-rake db:migrate:status`
- [x] promises don't fail (including slow ones)
- [x] web UI seems fine
- [x] git clone/fetch/push works well
- [x] email notifications are sent

and Nexedi edition patches:

- [x] raw blobs download
- [x] private ones with gitlab-ci token `curl -v https://user:token@testinstance/kirr/test/raw/master/hello.txt`
- [x] applying patches in merge-request
- [x] merge as topic in merge-request
- [x] "Nexedi edition" being present on front page and on page footers with ICP
- [x] clone protocol is only HTTPS (not SSH)

No changes are made in gitlab-workhorse and gitlab-shell upstream this time, but Nexedi patches and a cherry-picked commit are applied in a merge request on gitlab-ce.

Note: in order to build the gitlab SR, you need to change gitlab-ce repository to my own, as it is not merged yet:
```
--- a/software/gitlab/software.cfg
+++ b/software/gitlab/software.cfg
@@ -115,7 +115,7 @@ git-executable = ${git:location}/bin/git
 [gitlab-repository]
 <= git-repository
 #repository = https://gitlab.com/gitlab-org/gitlab-ce.git
-repository = https://lab.nexedi.com/nexedi/gitlab-ce.git
+repository = https://lab.nexedi.com/iv/gitlab-ce.git
```

# Gitlab backup (pull automation)

The idea is to regularly do a gitlab-backup pull for now, so that later, we can add some code to configure the other gitlab instance (not in production) to pull the created backup repo.

/reviewed-on nexedi/slapos!124

  - git-clone and build git-backup sources
  - add a cron job doing `gitlab-backup-pull` every 4 hours by default
  - add instance parameter to change backup frequency
  - add xnice for using less resources while backuping
  - add lock to avoid concurrent calls of backup script
  - add a specific software type `gitlab-export` doing all this instead of in
    `default`; this can be changed in Services > parameters (kirr's changes)

`coreutils`, `grep` and `tar` components are used by `gitlab-backup-pull`
script, as it is called from a cron and the PATH has to include these
binaries paths

This is needed until the patch regarding `pidfile` in wrapper.py
(571d6514) is added to released SlapOS cookbook egg.

No need to parse. This fixes several issues:
- key comments were messing up everything
- sometimes keys were repeated
- no way to remove key

The purpose of the added script is to shorten calling neoctl by removing the
need to constantly supply things SlapOS can provide on its own like
certificates and admin address. A sample command is now as simple as:

    ~/srv/runner/instance/slappartX/bin/neoctl set cluster STARTING_BACKUP

/reviewed-on nexedi/slapos!120