Merge branch 'master' into ce-to-ee

CHANGELOG-EE.md

 Please view this file on the master branch, on stable branches it's out of date.
 
+## 10.1.2 (2017-11-08)
+
+- [SECURITY] Fix vulnerability that could allow any user of a Geo instance to clone any repository on the secondary instance.
+- [SECURITY] Geo JSON web tokens now expire after two minutes to reduce risk of compromise.
+
 ## 10.1.1 (2017-10-31)
 
-- No changes.
 - [FIXED] Fix LDAP group sync for nested groups e.g. when base has uppercase or extraneous spaces. !3217
 - [FIXED] Geo: read-only safeguards was not working on Secondary node. !3227
 - [FIXED] fix height of rebase and approve buttons.

CHANGELOG.md

@@ -2,6 +2,12 @@
 documentation](doc/development/changelog.md) for instructions on adding your own
 entry.
 
+## 10.1.2 (2017-11-08)
+
+- [SECURITY] Add X-Content-Type-Options header in API responses to make it more difficult to find other vulnerabilities.
+- [SECURITY] Properly translate IP addresses written in decimal, octal, or other formats in SSRF protections in project imports.
+- [FIXED] Fix TRIGGER checks for MySQL.
+
 ## 10.1.1 (2017-10-31)
 
 - [FIXED] Auto Devops kubernetes default namespace is now correctly built out of gitlab project group-name. !14642 (Mircea Danila Dumitrescu)

app/assets/stylesheets/pages/merge_requests.scss

@@ -781,10 +781,9 @@
 
   .code-quality-container {
     border-top: 1px solid $gray-darker;
-    border-bottom: 1px solid $gray-darker;
     padding: $gl-padding-top;
     background-color: $gray-light;
-    margin: 4px -16px 0;
+    margin: $gl-padding -16px -16px;
 
     .mr-widget-code-quality-list {
       list-style: none;

changelogs/unreleased/fix-mysql-grant-check.yml

----
-title: Fix TRIGGER checks for MySQL
-merge_request:
-author:
-type: fixed

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

+# From Community Edition 10.2 to Enterprise Edition 10.2
+
+This guide assumes you have a correctly configured and tested installation of
+GitLab Community Edition 10.2. 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
+
+```bash
+sudo service gitlab stop
+```
+
+### 2. Get the EE code
+
+```bash
+cd /home/git/gitlab
+sudo -u git -H git remote add -f ee https://gitlab.com/gitlab-org/gitlab-ee.git
+sudo -u git -H git checkout 10-2-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
+
+```bash
+sudo service gitlab start
+sudo service nginx restart
+```
+
+### 5. Check application status
+
+Check if GitLab and its environment are configured correctly:
+
+```bash
+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:
+
+```bash
+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 10.2)
+
+### 1. Revert the code to the previous version
+
+```bash
+cd /home/git/gitlab
+sudo -u git -H git checkout 10-2-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

spec/services/geo/hashed_storage_migrated_event_store_spec.rb

 require 'spec_helper'
 
 describe Geo::HashedStorageMigratedEventStore do
-  set(:project) { create(:project, :hashed, path: 'bar') }
+  let(:project) { create(:project, :hashed, path: 'bar') }
   set(:secondary_node) { create(:geo_node) }
   let(:old_disk_path) { "#{project.namespace.full_path}/foo" }
   let(:old_wiki_disk_path) { "#{old_disk_path}.wiki" }