Merge remote-tracking branch 'origin/master' into ce-to-ee-2017-11-22

Signed-off-by: Rémy Coutable <remy@rymai.me>

CHANGELOG-EE.md

 Please view this file on the master branch, on stable branches it's out of date.
 
+## 10.2.1 (2017-11-22)
+
+- No changes.
+
 ## 10.2.0 (2017-11-22)
 
 ### Fixed (17 changes)

CHANGELOG.md

@@ -2,6 +2,13 @@
 documentation](doc/development/changelog.md) for instructions on adding your own
 entry.
 
+## 10.2.1 (2017-11-22)
+
+### Fixed (1 change)
+
+- Force disable Prometheus metrics.
+
+
 ## 10.2.0 (2017-11-22)
 
 ### Security (4 changes)

doc/gitlab-geo/README.md

@@ -141,10 +141,10 @@ If you installed GitLab using the Omnibus packages (highly recommended):
    secondary node for the moment.
 1. [Upload the GitLab License](../user/admin_area/license.md) on the **primary** Geo Node to unlock GitLab Geo.
 1. [Setup the database replication](database.md) (`primary (read-write) <-> secondary (read-only)` topology).
-1. [Configure SSH authorizations to use the database](ssh.md)
+1. [Lookup authorized SSH keys in the database](../administration/operations/speed_up_ssh.html), do this step for both primary AND secondary nodes.
 1. [Configure GitLab](configuration.md) to set the primary and secondary nodes.
 1. Optional: [Configure a secondary LDAP server](../administration/auth/ldap.md) for the secondary. See [notes on LDAP](#ldap).
-1. [Follow the after setup steps](after_setup.md).
+1. [Follow the "Using a Geo Server" guide](using_a_geo_server.md).
 
 [install-ee]: https://about.gitlab.com/downloads-ee/ "GitLab Enterprise Edition Omnibus packages downloads page"
 
@@ -157,10 +157,10 @@ If you installed GitLab from source:
    else in the secondary node for the moment.
 1. [Upload the GitLab License](../user/admin_area/license.md) on the **primary** Geo Node to unlock GitLab Geo.
 1. [Setup the database replication](database_source.md) (`primary (read-write) <-> secondary (read-only)` topology).
-1. [Configure SSH authorizations to use the database](ssh.md)
+1. [Lookup authorized SSH keys in the database](../administration/operations/speed_up_ssh.html), do this step for both primary AND secondary nodes.
 1. [Configure GitLab](configuration_source.md) to set the primary and secondary
    nodes.
-1. [Follow the after setup steps](after_setup.md).
+1. [Follow the "Using a Geo Server" guide](using_a_geo_server.md).
 
 [install-ee-source]: https://docs.gitlab.com/ee/install/installation.html "GitLab Enterprise Edition installation from source"
 

doc/gitlab-geo/configuration.md

@@ -157,7 +157,7 @@ correctly identified as a secondary Geo node and if Geo is enabled.
 If your installation isn't working properly, check the
 [troubleshooting](#troubleshooting) section.
 
-Point your users to the [after setup steps](after_setup.md).
+Point your users to the ["Using a Geo Server" guide](using_a_geo_server.md).
 
 ## Selective replication
 

doc/gitlab-geo/configuration_source.md

@@ -176,7 +176,7 @@ correctly identified as a secondary Geo node and if Geo is enabled.
 If your installation isn't working properly, check the
 [troubleshooting](configuration.md#troubleshooting) section.
 
-Point your users to the [after setup steps](after_setup.md).
+Point your users to the ["Using a Geo Server" guide](using_a_geo_server.md).
 
 ## Selective replication
 

doc/gitlab-geo/database.md

@@ -479,13 +479,6 @@ Geo secondary nodes use a tracking database to keep track of replication
 status and recover automatically from some replication issues. Follow the
 instructions for [enabling tracking database on the secondary server][tracking].
 
-### Next steps
-
-Now that the database replication is done, the next step is to configure SSH
-authorizations to use the database.
-
-[➤ Configure SSH authorizations to use the database](ssh.md)
-
 ## MySQL replication
 
 We don't support MySQL replication for GitLab Geo.

doc/gitlab-geo/database_source.md

@@ -462,13 +462,6 @@ data before running `pg_basebackup`.
 
 The replication process is now over.
 
-### Next steps
-
-Now that the database replication is done, the next step is to configure SSH
-authorizations to use the database.
-
-[➤ Configure SSH authorizations to use the database](ssh.md)
-
 ## MySQL replication
 
 We don't support MySQL replication for GitLab Geo.

doc/gitlab-geo/ssh.md

@@ -14,21 +14,9 @@ Note this feature is only available on operating systems that support OpenSSH
 version of OpenSSH for your server]
 (../administration/operations/speed_up_ssh.html#compiling-a-custom-version-of-openssh-for-centos-6).
 
-For both primary AND secondary nodes, follow the instructions on [configuring
-SSH authorization via database
-lookups](../administration/operations/speed_up_ssh.html).
+For both primary AND secondary nodes, follow the instructions on
+[looking up authorized SSH keys in the database](../administration/operations/speed_up_ssh.html).
 
 Note that the 'Write to "authorized keys" file' checkbox only needs
 to be unchecked on the primary node since it will be reflected automatically
 in the secondary if database replication is working.
-
-### Next steps
-
-Now that SSH authorizations are configured to use the database, the next step
-is to configure GitLab.
-
-[➤ GitLab Geo configuration](configuration.md)
-
-If you are running GitLab installed from source:
-
-[➤ GitLab Geo configuration (source)](configuration_source.md)

doc/gitlab-geo/after_setup.md → doc/gitlab-geo/using_a_geo_server.md

-# After setup
+# Using a Geo Server
 
 After you set up the [database replication and configure the GitLab Geo nodes][req],
 there are a few things to consider:
@@ -6,13 +6,13 @@ there are a few things to consider:
 1. Users need an extra step to be able to fetch code from the secondary and push
    to primary:
 
-     1. Clone the repository as normal do from the secondary node:
+     1. Clone the repository as you would normally do, but from the secondary node:
 
          ```bash
          git clone git@secondary.gitlab.example.com:user/repo.git
          ```
 
-     1. Change the remote push URL following this example:
+     1. Change the remote push URL to always push to primary, following this example:
 
          ```bash
          git remote set-url --push origin git@primary.gitlab.example.com:user/repo.git

package.json

@@ -14,14 +14,14 @@
   },
   "dependencies": {
     "autosize": "^4.0.0",
-    "axios": "^0.16.2",
+    "axios": "^0.17.1",
     "axios-mock-adapter": "^1.10.0",
-    "babel-core": "^6.22.1",
-    "babel-eslint": "^7.2.1",
-    "babel-loader": "^7.1.1",
-    "babel-plugin-transform-define": "^1.2.0",
-    "babel-preset-latest": "^6.24.0",
-    "babel-preset-stage-2": "^6.22.0",
+    "babel-core": "^6.26.0",
+    "babel-eslint": "^8.0.2",
+    "babel-loader": "^7.1.2",
+    "babel-plugin-transform-define": "^1.3.0",
+    "babel-preset-latest": "^6.24.1",
+    "babel-preset-stage-2": "^6.24.1",
     "blackst0ne-mermaid": "^7.1.0-fixed",
     "bootstrap-sass": "^3.3.6",
     "brace-expansion": "^1.1.8",
@@ -78,7 +78,7 @@
   },
   "devDependencies": {
     "@gitlab-org/gitlab-svgs": "^1.0.2",
-    "babel-plugin-istanbul": "^4.0.0",
+    "babel-plugin-istanbul": "^4.1.5",
     "eslint": "^3.10.1",
     "eslint-config-airbnb-base": "^10.0.1",
     "eslint-import-resolver-webpack": "^0.8.3",