Merge branch '7-11-stable' of dev.gitlab.org:gitlab/gitlabhq into 7-11-stable-ee

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

VERSION

-7.11.0.rc1-ee
\ No newline at end of file
+7.11.0.rc1-ee

config/initializers/attr_encrypted_no_db_connection.rb

+module AttrEncrypted
+  module Adapters
+    module ActiveRecord
+      def attribute_instance_methods_as_symbols_with_no_db_connection
+        # Use with_connection so the connection doesn't stay pinned to the thread.
+        connected = ::ActiveRecord::Base.connection_pool.with_connection(&:active?) rescue false
+        
+        if connected
+          # Call version from AttrEncrypted::Adapters::ActiveRecord
+          attribute_instance_methods_as_symbols_without_no_db_connection
+        else
+          # Call version from AttrEncrypted, i.e., `super` with regards to AttrEncrypted::Adapters::ActiveRecord
+          AttrEncrypted.instance_method(:attribute_instance_methods_as_symbols).bind(self).call
+        end
+      end
+
+      alias_method_chain :attribute_instance_methods_as_symbols, :no_db_connection
+    end
+  end
+end

doc/install/installation.md

@@ -68,7 +68,7 @@ If you want to use Kerberos for user authentication, then install libkrb5-dev:
     sudo apt-get install libkrb5-dev
-**Note:** If you don't know what Kerberos is, then you certainly don't need it.
+**Note:** If you don't know what Kerberos is, you can assume you don't need it.
 Make sure you have the right version of Git installed
@@ -195,9 +195,9 @@ We recommend using a PostgreSQL database. For MySQL check [MySQL setup guide](da
 ### Clone the Source
     # Clone GitLab repository
-    sudo -u git -H git clone https://gitlab.com/gitlab-org/gitlab-ce.git -b 7-10-stable gitlab
-**Note:** You can change `7-10-stable-ee` to `master` if you want the *bleeding edge* version, but never install master on a production server!
+    sudo -u git -H git clone https://gitlab.com/gitlab-org/gitlab-ce.git -b 7-11-stable-ee gitlab
+**Note:** You can change `7-11-stable-ee` to `master` if you want the *bleeding edge* version, but never install master on a production server!
 ### Configure It
@@ -294,7 +294,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.6.2] REDIS_URL=unix:/var/run/redis/redis.sock RAILS_ENV=production
+    sudo -u git -H bundle exec rake gitlab:shell:install[v2.6.3] 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.10.md → doc/update/6.x-or-7.x-to-7.11.md

-# From 6.x or 7.x to 7.10
-*Make sure you view this [upgrade guide from the `master` branch](../../../master/doc/update/6.x-or-7.x-to-7.10.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.10.
+# From 6.x or 7.x to 7.11
+*Make sure you view this [upgrade guide from the `master` branch](../../../master/doc/update/6.x-or-7.x-to-7.11.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.11.
 ## 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-10-stable
+sudo -u git -H git checkout 7-11-stable
 ```
 OR
@@ -79,7 +79,7 @@ OR
 For GitLab Enterprise Edition:
 ```bash
-sudo -u git -H git checkout 7-10-stable-ee
+sudo -u git -H git checkout 7-11-stable-ee
 ```
 ## 4. Install additional packages
@@ -91,7 +91,8 @@ sudo apt-get install logrotate
 # Install pkg-config and cmake, which is needed for the latest versions of rugged
 sudo apt-get install pkg-config cmake
-# Install Kerberos header files, which are needed for GitLab EE Kerberos support
+# If you want to use Kerberos with GitLab EE for user authentication, install Kerberos header files
+# If you don't know what Kerberos is, you can assume you don't need it.
 sudo apt-get install libkrb5-dev
 # Install nodejs, javascript runtime required for assets
@@ -126,7 +127,7 @@ sudo apt-get install nodejs
 ```bash
 cd /home/git/gitlab-shell
 sudo -u git -H git fetch
-sudo -u git -H git checkout v2.6.2
+sudo -u git -H git checkout v2.6.3
 ```
 ## 7. Install libs, migrations, etc.
@@ -163,11 +164,11 @@ 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-10-stable-ee:config/gitlab.yml.example
+git diff 6-0-stable:config/gitlab.yml.example 7-11-stable-ee:config/gitlab.yml.example
 ```
-* Make `/home/git/gitlab/config/gitlab.yml` the same as https://gitlab.com/subscribers/gitlab-ee/blob/7-10-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-10-stable-ee/config/unicorn.rb.example but with your settings.
+* Make `/home/git/gitlab/config/gitlab.yml` the same as https://gitlab.com/subscribers/gitlab-ee/blob/7-11-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-11-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
@@ -183,8 +184,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/subscribers/gitlab-ee/blob/7-10-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-10-stable-ee/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-11-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-11-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

doc/update/7.10-to-7.11.md

+# From 7.10 to 7.11
+
+### 0. Stop server
+
+    sudo service gitlab stop
+
+### 1. Backup
+
+```bash
+cd /home/git/gitlab
+sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production
+```
+
+### 2. Get latest code
+
+```bash
+sudo -u git -H git fetch --all
+sudo -u git -H git checkout -- db/schema.rb # local changes will be restored automatically
+```
+
+For GitLab Community Edition:
+
+```bash
+sudo -u git -H git checkout 7-11-stable
+```
+
+OR
+
+For GitLab Enterprise Edition:
+
+```bash
+sudo -u git -H git checkout 7-11-stable-ee
+```
+
+### 3. Update gitlab-shell
+
+```bash
+cd /home/git/gitlab-shell
+sudo -u git -H git fetch
+sudo -u git -H git checkout v2.6.3
+```
+
+### 4. Install libs, migrations, etc.
+
+```bash
+cd /home/git/gitlab
+
+# MySQL installations (note: the line below states '--without ... postgres')
+sudo -u git -H bundle install --without development test postgres --deployment
+
+# PostgreSQL installations (note: the line below states '--without ... mysql')
+sudo -u git -H bundle install --without development test mysql --deployment
+
+# Run database migrations
+sudo -u git -H bundle exec rake db:migrate RAILS_ENV=production
+
+# Clean up assets and cache
+sudo -u git -H bundle exec rake assets:clean assets:precompile cache:clear RAILS_ENV=production
+
+# Update init.d script
+sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab
+```
+
+### 5. Update config files
+
+#### New configuration options for `gitlab.yml`
+
+There are new configuration options available for [`gitlab.yml`](config/gitlab.yml.example). View them with the command below and apply them to your current `gitlab.yml`.
+
+```
+git diff origin/7-10-stable:config/gitlab.yml.example origin/7-11-stable:config/gitlab.yml.example
+``````
+
+### 6. Start application
+
+    sudo service gitlab start
+    sudo service nginx restart
+
+### 7. Check application status
+
+Check if GitLab and its environment are configured correctly:
+
+    sudo -u git -H bundle exec rake gitlab:env:info RAILS_ENV=production
+
+To make sure you didn't miss anything run a more thorough check with:
+
+    sudo -u git -H bundle exec rake gitlab:check RAILS_ENV=production
+
+If all items are green, then congratulations, the upgrade is complete!
+
+## Things went south? Revert to previous version (7.10)
+
+### 1. Revert the code to the previous version
+Follow the [upgrade guide from 7.9 to 7.10](7.9-to-7.10.md), except for the database migration
+(The backup is already migrated to the previous version)
+
+### 2. Restore from the backup:
+
+```bash
+cd /home/git/gitlab
+sudo -u git -H bundle exec rake gitlab:backup:restore RAILS_ENV=production
+```
+If you have more than one backup *.tar file(s) please add `BACKUP=timestamp_of_backup` to the command above.