Merge branch 'ce-to-ee-2018-11-19' into 'master'

CE upstream - 2018-11-19 22:21 UTC

See merge request gitlab-org/gitlab-ee!8521

.gitlab-ci.yml

@@ -600,19 +600,19 @@ danger-review:
 
 rspec-pg:
   <<: *rspec-metadata-pg
-  parallel: 30
+  parallel: 50
 
 rspec-mysql:
   <<: *rspec-metadata-mysql
-  parallel: 30
+  parallel: 50
 
 rspec-pg-rails4:
   <<: *rspec-metadata-pg-rails4
-  parallel: 30
+  parallel: 50
 
 rspec-mysql-rails4:
   <<: *rspec-metadata-mysql-rails4
-  parallel: 30
+  parallel: 50
 
 # EE jobs START
 rspec-pg-ee:

app/assets/javascripts/diff_notes/components/jump_to_discussion.js

@@ -112,7 +112,7 @@ const JumpToDiscussion = Vue.extend({
 
       if (!hasDiscussionsToJumpTo) {
         // If there are no discussions to jump to on the current page,
-        // switch to the notes tab and jump to the first disucssion there.
+        // switch to the notes tab and jump to the first discussion there.
         window.mrTabs.activateTab('show');
         activeTab = 'show';
         jumpToFirstDiscussion = true;

app/assets/javascripts/diffs/store/getters.js

@@ -23,7 +23,7 @@ export const diffHasAllExpandedDiscussions = (state, getters) => diff => {
 };
 
 /**
- * Checks if the diff has all discussions collpased
+ * Checks if the diff has all discussions collapsed
  * @param {Object} diff
  * @returns {Boolean}
  */

app/assets/javascripts/notebook/cells/output/index.vue

@@ -22,7 +22,7 @@ export default {
     },
     output: {
       type: Object,
-      requred: true,
+      required: true,
       default: () => ({}),
     },
   },

changelogs/unreleased/gt-fix-typo-in-notebook-props.yml

+---
+title: Fix typo in notebook props
+merge_request: 23103
+author: George Tsiolis
+type: other

doc/user/project/clusters/runbooks/index.md

@@ -10,8 +10,8 @@ Historically, runbooks took the form of a decision tree or a detailed
 step-by-step guide depending on the condition or system. 
 
 Modern implementations have introduced the concept of an "executable 
-runbooks", where along with a well define process, operators can execute 
-code blocks or database queries against a given environment.
+runbooks", where, along with a well-defined process, operators can execute 
+pre-written code blocks or database queries against a given environment.
 
 ## Nurtch Executable Runbooks
 
@@ -45,5 +45,93 @@ To create an executable runbook, you will need:
 Nurtch is the company behind the [Rubix library](https://github.com/Nurtch/rubix). Rubix is 
 an open-source python library that makes it easy to perform common DevOps tasks inside Jupyter Notebooks. 
 Tasks such as plotting Cloudwatch metrics and rolling your ECS/Kubernetes app are simplified 
-down to a couple of lines of code. Check the [Nurtch Documentation](http://docs.nurtch.com/en/latest) 
+down to a couple of lines of code. See the [Nurtch Documentation](http://docs.nurtch.com/en/latest) 
 for more information.
+
+## Configure an executable runbook with GitLab
+
+Follow this step-by-step guide to configure an executable runbook in GitLab using 
+the components outlined above and the preloaded demo runbook.
+
+### 1. Add a Kubernetes cluster
+
+Follow the steps outlined in [Adding and creating a new GKE cluster via GitLab](https://docs.gitlab.com/ee/user/project/clusters/#adding-and-creating-a-new-gke-cluster-via-gitlab) 
+to add a Kubernetes cluster to your project.
+
+### 2. Install Helm Tiller, Ingress, and JupyterHub
+
+Once the cluster has been provisioned in GKE, click the **Install** button next to the **Helm Tiller** app.
+
+![install helm](img/helm-install.png)
+
+Once Tiller has been installed successfully, click the **Install** button next to the **Ingress** app.
+
+![install ingress](img/ingress-install.png)
+
+Once Ingress has been installed successfully, click the **Install** button next to the **JupyterHub** app.
+
+![install jupyterhub](img/jupyterhub-install.png)
+
+### 3. Login to JupyterHub and start the server
+
+Once JupyterHub has been installed successfully, navigate to the displayed **Jupyter Hostname** URL and click 
+**Sign in with GitLab**. Authentication is automatically enabled for any user of the GitLab instance via OAuth2. This 
+will redirect to GitLab in order to authorize JupyterHub to use your GitLab account. Click **Authorize**.
+
+![authorize jupyter](img/authorize-jupyter.png)
+
+Once the application has been authorized you will taken back to the JupyterHub application. Click **Start My Server**. 
+The server will take a couple of seconds to start.
+
+### 4. Configure access
+
+In order for the runbook to access your GitLab project, you will need to enter a
+[GitLab Access Token](https://docs.gitlab.com/ee/user/profile/personal_access_tokens.html)
+as well as your Project ID in the **Setup** section of the demo runbook.
+
+Double-click the **DevOps-Runbook-Demo** folder located on the left panel.
+
+![demo runbook](img/demo-runbook.png)
+
+Double-click the "Nurtch-DevOps-Demo.ipynb" runbook.
+
+![sample runbook](img/sample-runbook.png)
+
+The contents on the runbook will be displayed on the right side of the screen. Under the "Setup" section, you will find 
+entries for both your `PRIVATE_TOKEN` and your `PROJECT_ID`. Enter both these values, conserving the single quotes as follows:
+
+```sql
+PRIVATE_TOKEN = 'n671WNGecHugsdEDPsyo'
+PROJECT_ID = '1234567'
+```
+
+Update the `VARIABLE_NAME` on the last line of this section to match the name of the variable you are using for your 
+access token. In this example our variable name is `PRIVATE_TOKEN`.
+
+```sql
+VARIABLE_VALUE = project.variables.get('PRIVATE_TOKEN').value
+```
+
+### 5. Configure an operation
+
+For this example we'll use the "**Run SQL queries in Notebook**" section in the sample runbook to query 
+a postgres database. The first 4 lines of the section define the variables that are required for this query to function. 
+
+```sql
+%env DB_USER={project.variables.get('DB_USER').value}
+%env DB_PASSWORD={project.variables.get('DB_PASSWORD').value}
+%env DB_ENDPOINT={project.variables.get('DB_ENDPOINT').value}
+%env DB_NAME={project.variables.get('DB_NAME').value}
+```
+
+Create the matching variables in your project's **Settings >> CI/CD >> Variables**
+
+![gitlab variables](img/gitlab-variables.png)
+
+Back in Jupyter, click the "Run SQL queries in Notebook" heading and the click *Run*. The results will be 
+displayed in-line as follows:
+
+![postgres query](img/postgres-query.png)
+
+You can try other operations such as running shell scripts or interacting with a Kubernetes cluster. Visit the 
+[Nurtch Documentation](http://docs.nurtch.com/) for more information.
\ No newline at end of file

doc/user/project/merge_requests/index.md

@@ -344,9 +344,10 @@ all your changes will be available to preview by anyone with the Review Apps lin
 
 ## Merge request diff file navigation
 
-The diff view has a file tree for file navigation. As you scroll through
-diffs with a large number of files, you can easily jump to any changed file
-using the file tree.
+When reviewing changes in the **Changes** tab the diff can be navigated using
+the file tree or file list. As you scroll through large diffs with many
+changes, you can quickly jump to any changed file using the file tree or file
+list.
 
 ![Merge request diff file navigation](img/merge_request_diff_file_navigation.png)
 

spec/javascripts/vue_shared/components/expand_button_spec.js

@@ -18,7 +18,7 @@ describe('expand button', () => {
     vm.$destroy();
   });
 
-  it('renders a collpased button', () => {
+  it('renders a collapsed button', () => {
     expect(vm.$children[0].iconTestClass).toEqual('ic-ellipsis_h');
   });
 

spec/lib/gitlab/import_export/project.json

@@ -2556,7 +2556,7 @@
             "merge_request_diff_id": 27,
             "relative_order": 0,
             "sha": "bb5206fee213d983da88c47f9cf4cc6caf9c66dc",
-            "message": "Feature conflcit added\n\nSigned-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>\n",
+            "message": "Feature conflict added\n\nSigned-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>\n",
             "authored_date": "2014-08-06T08:35:52.000+02:00",
             "author_name": "Dmitriy Zaporozhets",
             "author_email": "dmitriy.zaporozhets@gmail.com",
@@ -3606,7 +3606,7 @@
             "merge_request_diff_id": 14,
             "relative_order": 8,
             "sha": "08f22f255f082689c0d7d39d19205085311542bc",
-            "message": "remove emtpy file.(beacase git ignore empty file)\nadd whitespace test file.\n",
+            "message": "remove empty file.(beacase git ignore empty file)\nadd whitespace test file.\n",
             "authored_date": "2015-11-13T06:00:16.000+01:00",
             "author_name": "윤민식",
             "author_email": "minsik.yoon@samsung.com",
@@ -4291,7 +4291,7 @@
             "merge_request_diff_id": 13,
             "relative_order": 8,
             "sha": "08f22f255f082689c0d7d39d19205085311542bc",
-            "message": "remove emtpy file.(beacase git ignore empty file)\nadd whitespace test file.\n",
+            "message": "remove empty file.(beacase git ignore empty file)\nadd whitespace test file.\n",
             "authored_date": "2015-11-13T06:00:16.000+01:00",
             "author_name": "윤민식",
             "author_email": "minsik.yoon@samsung.com",
@@ -4800,7 +4800,7 @@
             "merge_request_diff_id": 12,
             "relative_order": 8,
             "sha": "08f22f255f082689c0d7d39d19205085311542bc",
-            "message": "remove emtpy file.(beacase git ignore empty file)\nadd whitespace test file.\n",
+            "message": "remove empty file.(beacase git ignore empty file)\nadd whitespace test file.\n",
             "authored_date": "2015-11-13T06:00:16.000+01:00",
             "author_name": "윤민식",
             "author_email": "minsik.yoon@samsung.com",
@@ -5508,7 +5508,7 @@
             "merge_request_diff_id": 10,
             "relative_order": 8,
             "sha": "08f22f255f082689c0d7d39d19205085311542bc",
-            "message": "remove emtpy file.(beacase git ignore empty file)\nadd whitespace test file.\n",
+            "message": "remove empty file.(beacase git ignore empty file)\nadd whitespace test file.\n",
             "authored_date": "2015-11-13T06:00:16.000+01:00",
             "author_name": "윤민식",
             "author_email": "minsik.yoon@samsung.com",