Merge remote-tracking branch 'ce/master' into ce_into_ee

Conflicts:
	doc/install/installation.md
	doc/update/6.x-or-7.x-to-7.9.md

app/views/admin/services/_form.html.haml

@@ -14,9 +14,9 @@
       = preserve do
         = markdown @service.help
 
+  - if @service.supported_events.length > 1
     .form-group
       = f.label :url, "Trigger", class: 'control-label'
-    - if @service.supported_events.length > 1
       .col-sm-10
         - if @service.supported_events.include?("push")
           %div

app/views/projects/services/_form.html.haml

@@ -27,9 +27,9 @@
     .col-sm-10
       = f.check_box :active
 
+  - if @service.supported_events.length > 1
     .form-group
       = f.label :url, "Trigger", class: 'control-label'
-    - if @service.supported_events.length > 1
       .col-sm-10
         - if @service.supported_events.include?("push")
           %div

doc/install/installation.md

@@ -184,10 +184,10 @@ We recommend using a PostgreSQL database. For MySQL check [MySQL setup guide](da
 
     # Clone GitLab repository
 
-    sudo -u git -H git clone https://gitlab.com/subscribers/gitlab-ee.git -b 7-8-stable-ee gitlab
+    sudo -u git -H git clone https://gitlab.com/subscribers/gitlab-ee.git -b 7-9-stable-ee gitlab
 
 
-**Note:** You can change `7-8-stable-ee` to `master` if you want the *bleeding edge* version, but never install master on a production server!
+**Note:** You can change `7-9-stable-ee` to `master` if you want the *bleeding edge* version, but never install master on a production server!
 
 
 ### Configure It
@@ -283,7 +283,7 @@ We recommend using a PostgreSQL database. For MySQL check [MySQL setup guide](da
 GitLab Shell is an SSH access and repository management software developed specially for GitLab.
 
     # Run the installation task for gitlab-shell (replace `REDIS_URL` if needed):
-    sudo -u git -H bundle exec rake gitlab:shell:install[v2.5.4] REDIS_URL=unix:/var/run/redis/redis.sock RAILS_ENV=production
+    sudo -u git -H bundle exec rake gitlab:shell:install[v2.6.0] REDIS_URL=unix:/var/run/redis/redis.sock RAILS_ENV=production
 
     # By default, the gitlab-shell config is generated from your main GitLab config.
     # You can review (and modify) the gitlab-shell config as follows:

doc/update/6.x-or-7.x-to-7.8.md → doc/update/6.x-or-7.x-to-7.9.md

-# From 6.x or 7.x to 7.8
-*Make sure you view this [upgrade guide from the `master` branch](../../../master/doc/update/6.x-or-7.x-to-7.8.md) for the most up to date instructions.*
+# From 6.x or 7.x to 7.9
+*Make sure you view this [upgrade guide from the `master` branch](../../../master/doc/update/6.x-or-7.x-to-7.9.md) for the most up to date instructions.*
 
-This allows you to upgrade any version of GitLab from 6.0 and up (including 7.0 and up) to 7.8.
+This allows you to upgrade any version of GitLab from 6.0 and up (including 7.0 and up) to 7.9.
 
 ## Global issue numbers
 
@@ -71,7 +71,7 @@ sudo -u git -H git checkout -- db/schema.rb # local changes will be restored aut
 For GitLab Community Edition:
 
 ```bash
-sudo -u git -H git checkout 7-8-stable
+sudo -u git -H git checkout 7-9-stable
 ```
 
 OR
@@ -79,7 +79,7 @@ OR
 For GitLab Enterprise Edition:
 
 ```bash
-sudo -u git -H git checkout 7-8-stable-ee
+sudo -u git -H git checkout 7-9-stable-ee
 ```
 
 ## 4. Install additional packages
@@ -93,6 +93,9 @@ sudo apt-get install pkg-config cmake
 
 # Install Kerberos header files, which are needed for GitLab EE Kerberos support
 sudo apt-get install libkrb5-dev
+
+# Install nodejs, javascript runtime required for assets
+sudo apt-get install nodejs
 ```
 
 ## 5. Configure Redis to use sockets
@@ -123,7 +126,7 @@ sudo apt-get install libkrb5-dev
 ```bash
 cd /home/git/gitlab-shell
 sudo -u git -H git fetch
-sudo -u git -H git checkout v2.5.4
+sudo -u git -H git checkout v2.6.0
 ```
 
 ## 7. Install libs, migrations, etc.
@@ -160,12 +163,12 @@ sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab
 TIP: to see what changed in `gitlab.yml.example` in this release use next command:
 
 ```
-git diff 6-0-stable:config/gitlab.yml.example 7-8-stable-ee:config/gitlab.yml.example
+git diff 6-0-stable:config/gitlab.yml.example 7-9-stable-ee:config/gitlab.yml.example
 ```
 
-* Make `/home/git/gitlab/config/gitlab.yml` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/7-8-stable/config/gitlab.yml.example but with your settings.
-* Make `/home/git/gitlab/config/unicorn.rb` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/7-8-stable/config/unicorn.rb.example but with your settings.
-* Make `/home/git/gitlab-shell/config.yml` the same as https://gitlab.com/gitlab-org/gitlab-shell/blob/v2.5.4/config.yml.example but with your settings.
+* Make `/home/git/gitlab/config/gitlab.yml` the same as https://gitlab.com/subscribers/gitlab-ee/blob/7-9-stable-ee/config/gitlab.yml.example but with your settings.
+* Make `/home/git/gitlab/config/unicorn.rb` the same as https://gitlab.com/subscribers/gitlab-ee/blob/7-9-stable-ee/config/unicorn.rb.example but with your settings.
+* Make `/home/git/gitlab-shell/config.yml` the same as https://gitlab.com/gitlab-org/gitlab-shell/blob/v2.6.0/config.yml.example but with your settings.
 * Copy rack attack middleware config
 
 ```bash
@@ -180,8 +183,8 @@ sudo cp lib/support/logrotate/gitlab /etc/logrotate.d/gitlab
 
 ### Change Nginx settings
 
-* HTTP setups: Make `/etc/nginx/sites-available/gitlab` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/7-8-stable/lib/support/nginx/gitlab but with your settings.
-* HTTPS setups: Make `/etc/nginx/sites-available/gitlab-ssl` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/7-8-stable/lib/support/nginx/gitlab-ssl but with your settings.
+* HTTP setups: Make `/etc/nginx/sites-available/gitlab` the same as https://gitlab.com/subscribers/gitlab-ee/blob/7-9-stable-ee/lib/support/nginx/gitlab but with your settings.
+* HTTPS setups: Make `/etc/nginx/sites-available/gitlab-ssl` the same as https://gitlab.com/subscribers/gitlab-ee/blob/7-9-stable-ee/lib/support/nginx/gitlab-ssl but with your settings.
 * A new `location /uploads/` section has been added that needs to have the same content as the existing `location @gitlab` section.
 
 ## 9. Start application