Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ee into ce-upstream

CHANGELOG-EE

@@ -3,10 +3,23 @@ Please view this file on the master branch, on stable branches it's out of date.
 v 8.8.0 (unreleased)
   - [Elastic] Database indexer prints its status
   - [Elastic][Fix] Database indexer skips projects with invalid HEAD reference
+  - Fix skipping pages when restoring backups
   - [Elastic] More efficient snippets search
   - [Elastic] Add rake task for removing all indexes
   - [Elastic] Add rake task for clearing indexing status
   - Set KRB5 as default clone protocol when Kerberos is enabled and user is logged in (Borja Aparicio)
+  - Reduce emails-on-push HTML size by using a simple monospace font
+
+v 8.7.5
+  - No EE-specific changes
+
+v 8.7.4
+  - Delete ProjectImportData record only if Project is not a mirror !370
+  - Fixed typo in GitLab GEO license check alert !379
+  - Fix LDAP access level spillover bug !499
+
+v 8.7.3
+  - No EE-specific changes
 
 v 8.7.2
   - Fix MR notifications for slack and hipchat when approvals are fullfiled. !325

app/assets/stylesheets/mailers/repository_push_email.scss

@@ -2,7 +2,7 @@
 
 table.code {
   width: 100%;
-  font-family: $monospace_font;
+  font-family: monospace;
   border: none;
   border-collapse: separate;
   margin: 0;
@@ -13,7 +13,7 @@ table.code {
 
   td {
     line-height: $code_line_height;
-    font-family: $monospace_font;
+    font-family: monospace;
     font-size: $code_font_size;
   }
 

app/workers/concerns/geo_dynamic_backoff.rb

@@ -19,8 +19,8 @@ module GeoDynamicBackoff
 
   def geometric_backoff_strategy(count)
     # This strategy is based on the original one from sidekiq
-    count = count-30 # we must start counting after 30
-    (count ** 4) + 15 + (rand(30)*(count+1))
+    count = count - 30 # we must start counting after 30
+    (count**4) + 15 + (rand(30) * (count + 1))
   end
 
 end

config/initializers/1_settings.rb

@@ -293,8 +293,8 @@ Settings.artifacts['max_size']    ||= 100 # in megabytes
 Settings['pages'] ||= Settingslogic.new({})
 Settings.pages['enabled']         = false if Settings.pages['enabled'].nil?
 Settings.pages['path']            = File.expand_path(Settings.pages['path'] || File.join(Settings.shared['path'], "pages"), Rails.root)
-Settings.pages['host']            ||= "example.com"
 Settings.pages['https']           = false if Settings.pages['https'].nil?
+Settings.pages['host']            ||= "example.com"
 Settings.pages['port']            ||= Settings.pages.https ? 443 : 80
 Settings.pages['protocol']        ||= Settings.pages.https ? "https" : "http"
 Settings.pages['url']             ||= Settings.send(:build_pages_url)

doc/update/8.8-ce-to-ee.md

+# From Community Edition 8.8 to Enterprise Edition 8.8
+
+This guide assumes you have a correctly configured and tested installation of
+GitLab Community Edition 8.8. If you run into any trouble or if you have any
+questions please contact us at [support@gitlab.com].
+
+### 0. Backup
+
+Make a backup just in case something goes wrong:
+
+```bash
+cd /home/git/gitlab
+sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production
+```
+
+For installations using MySQL, this may require granting "LOCK TABLES"
+privileges to the GitLab user on the database version.
+
+### 1. Stop server
+
+    sudo service gitlab stop
+
+### 2. Get the EE code
+
+```bash
+cd /home/git/gitlab
+sudo -u git -H git remote add ee https://gitlab.com/gitlab-org/gitlab-ee.git
+sudo -u git -H git fetch --all
+sudo -u git -H git checkout 8-8-stable-ee
+```
+
+### 3. 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 postgres development test --deployment
+
+# PostgreSQL installations (note: the line below states '--without mysql')
+sudo -u git -H bundle install --without mysql development test --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
+```
+
+### 4. Start application
+
+    sudo service gitlab start
+    sudo service nginx restart
+
+### 5. 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 upgrade complete!
+
+## Things went south? Revert to previous version (Community Edition 8.7)
+
+### 1. Revert the code to the previous version
+
+```bash
+cd /home/git/gitlab
+sudo -u git -H git checkout 8-7-stable
+```
+
+### 2. Restore from the backup
+
+```bash
+cd /home/git/gitlab
+sudo -u git -H bundle exec rake gitlab:backup:restore RAILS_ENV=production
+```
+
+[support@gitlab.com]: mailto:support@gitlab.com

lib/api/groups.rb

@@ -40,7 +40,7 @@ module API
 
         if @group.save
           # NOTE: add backwards compatibility for single ldap link
-          ldap_attrs  = attributes_for_keys [:ldap_cn, :ldap_access]
+          ldap_attrs = attributes_for_keys [:ldap_cn, :ldap_access]
           if ldap_attrs.present?
             @group.ldap_group_links.create({
               cn: ldap_attrs[:ldap_cn],

lib/gitlab/ldap/person.rb

@@ -66,11 +66,11 @@ module Gitlab
       def windows_domain_name
         # The following is only meaningful for Active Directory
         require 'net/ldap/dn'
-        dn_components=[]
+        dn_components = []
         Net::LDAP::DN.new(dn).each_pair { |name, value| dn_components << { name: name, value: value } }
         dn_components.
           reverse.
-          take_while { |rdn| rdn[:name].casecmp('DC') == 0 }. # Domain Component
+          take_while { |rdn| rdn[:name].upcase == 'DC' }. # Domain Component
           map { |rdn| rdn[:value] }.
           reverse.
           join('.')

lib/tasks/gitlab/backup.rake

@@ -54,7 +54,7 @@ namespace :gitlab do
       Rake::Task['gitlab:backup:uploads:restore'].invoke unless backup.skipped?('uploads')
       Rake::Task['gitlab:backup:builds:restore'].invoke unless backup.skipped?('builds')
       Rake::Task['gitlab:backup:artifacts:restore'].invoke unless backup.skipped?('artifacts')
-      Rake::Task['gitlab:backup:pages:restore'].invoke unless backup.skipped?('artifacts')
+      Rake::Task['gitlab:backup:pages:restore'].invoke unless backup.skipped?('pages')
       Rake::Task['gitlab:backup:lfs:restore'].invoke unless backup.skipped?('lfs')
       Rake::Task['gitlab:shell:setup'].invoke
 

spec/models/concerns/elastic/issue_spec.rb

@@ -32,7 +32,7 @@ describe "Issue", elastic: true do
     project = create :empty_project
     issue = create :issue, project: project
 
-    expected_hash =  issue.attributes.extract!('id', 'iid', 'title', 'description', 'created_at',
+    expected_hash = issue.attributes.extract!('id', 'iid', 'title', 'description', 'created_at',
                                                 'updated_at', 'state', 'project_id', 'author_id',
                                                 'assignee_id', 'confidential')
 

spec/models/concerns/elastic/merge_request_spec.rb

@@ -31,7 +31,7 @@ describe "MergeRequest", elastic: true do
   it "returns json with all needed elements" do
     merge_request = create :merge_request
 
-    expected_hash =  merge_request.attributes.extract!(
+    expected_hash = merge_request.attributes.extract!(
       'id',
       'iid',
       'target_branch',

spec/models/concerns/elastic/milestone_spec.rb

@@ -31,7 +31,7 @@ describe "Milestone", elastic: true do
   it "returns json with all needed elements" do
     milestone = create :milestone
 
-    expected_hash =  milestone.attributes.extract!(
+    expected_hash = milestone.attributes.extract!(
       'id',
       'title',
       'description',

spec/models/concerns/elastic/note_spec.rb

@@ -30,7 +30,7 @@ describe "Note", elastic: true do
   it "returns json with all needed elements" do
     note = create :note
 
-    expected_hash =  note.attributes.extract!(
+    expected_hash = note.attributes.extract!(
       'id',
       'note',
       'project_id',