Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-04-17

# Conflicts:
#	app/assets/javascripts/vue_merge_request_widget/dependencies.js
#	doc/user/project/web_ide/img/commit_changes.png
#	doc/user/project/web_ide/index.md
#	qa/qa/page/merge_request/show.rb

[ci skip]

.gitlab/merge_request_templates/Database Changes.md

@@ -45,4 +45,4 @@ When removing columns, tables, indexes or other structures:
 - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
 - [ ] Internationalization required/considered
 - [ ] If paid feature, have we considered GitLab.com plan and how it works for groups and is there a design for promoting it to users who aren't on the correct plan
-- [ ] End-to-end tests pass (`package-qa` manual pipeline job)
+- [ ] End-to-end tests pass (`package-and-qa` manual pipeline job)

app/assets/javascripts/vue_merge_request_widget/dependencies.js

@@ -27,7 +27,11 @@ export { default as ConflictsState } from './components/states/mr_widget_conflic
 export { default as NothingToMergeState } from './components/states/nothing_to_merge.vue';
 export { default as MissingBranchState } from './components/states/mr_widget_missing_branch.vue';
 export { default as NotAllowedState } from './components/states/mr_widget_not_allowed.vue';
+<<<<<<< HEAD
 export { default as ReadyToMergeState } from 'ee/vue_merge_request_widget/components/states/mr_widget_ready_to_merge';
+=======
+export { default as ReadyToMergeState } from './components/states/ready_to_merge.vue';
+>>>>>>> upstream/master
 export { default as ShaMismatchState } from './components/states/sha_mismatch.vue';
 export { default as UnresolvedDiscussionsState } from './components/states/unresolved_discussions.vue';
 export { default as PipelineBlockedState } from './components/states/mr_widget_pipeline_blocked.vue';

doc/administration/plugins.md

@@ -33,6 +33,10 @@ Follow the steps below to set up a custom hook:
    For an installation from source the path is usually
    `/home/git/gitlab/plugins/`. For Omnibus installs the path is
    usually `/opt/gitlab/embedded/service/gitlab-rails/plugins`.
+
+    For [highly available] configurations, your hook file should exist on each
+    application server.
+
 1. Inside the `plugins` directory, create a file with a name of your choice,
    without spaces or special characters.
 1. Make the hook file executable and make sure it's owned by the git user.
@@ -78,3 +82,4 @@ Validating plugins from /plugins directory
 
 [system hooks]: ../system_hooks/system_hooks.md
 [webhooks]: ../user/project/integrations/webhooks.md
+[highly available]: ./high_availability/README.md
\ No newline at end of file

doc/install/kubernetes/gitlab_runner_chart.md

@@ -72,6 +72,18 @@ concurrent: 10
 ##
 checkInterval: 30
 
+## For RBAC support:
+rbac:
+  create: false
+
+  ## Run the gitlab-bastion container with the ability to deploy/manage containers of jobs
+  ## cluster-wide or only within namespace
+  clusterWideAccess: false
+
+  ## Use the following Kubernetes Service Account name if RBAC is disabled in this Helm chart (see rbac.create)
+  ##
+  # serviceAccountName: default
+
 ## Configuration for the Pods that that the runner launches for each new job
 ##
 runners:
@@ -116,6 +128,12 @@ runners:
 
 ```
 
+### Enabling RBAC support
+
+If your cluster has RBAC enabled, you can choose to either have the chart create its own sevice account or provide one.
+
+To have the chart create the service account for you, set `rbac.create` to true. 
+
 ### Controlling maximum Runner concurrency
 
 A single GitLab Runner deployed on Kubernetes is able to execute multiple jobs in parallel by automatically starting additional Runner pods. The [`concurrent` setting](https://docs.gitlab.com/runner/configuration/advanced-configuration.html#the-global-section) controls the maximum number of pods allowed at a single time, and defaults to `10`.

doc/user/project/index.md

@@ -52,6 +52,7 @@ and time spent on
 templates for issue and merge request description fields for your project
 - [Slash commands (quick actions)](quick_actions.md): Textual shortcuts for
 common actions on issues or merge requests
+- [Web IDE](web_ide/index.md)
 
 **GitLab CI/CD:**
 

doc/user/project/web_ide/index.md

 # Web IDE
 
 > Introduced in [GitLab Ultimate][ee] 10.4.
+<<<<<<< HEAD
 
 > **Warning:** Web IDE is in **Beta**. For the latest updates, check the
 > associated [epic](https://gitlab.com/groups/gitlab-org/-/epics/26).
@@ -21,6 +22,17 @@ navigate to **Settings > Preferences**, check **Enable Web IDE** and save.
 
 Once enabled, the Web IDE can be opened when viewing a file, from the
 repository file list.
+=======
+> Brought to [GitLab CE][ce] in 10.7.
+
+The Web IDE makes it faster and easier to contribute changes to your projects
+by providing an advanced editor with commit staging.
+
+## Open the Web IDE
+
+The Web IDE can be opened when viewing a file, from the repository file list,
+and from merge requests.
+>>>>>>> upstream/master
 
 ![Open Web IDE](img/open_web_ide.png)
 
@@ -32,4 +44,18 @@ the 'Commit Button'.
 
 ![Commit changes](img/commit_changes.png)
 
+<<<<<<< HEAD
+[ee]: https://about.gitlab.com/products/
+=======
+## Comparing changes
+
+Before you commit your changes, you can compare them with the previous commit
+by switching to the review mode or selecting the file from the staged files
+list.
+
+An additional review mode is available when you open a merge request, which
+shows you a preview of the merge request diff if you commit your changes.
+
 [ee]: https://about.gitlab.com/products/
+[ce]: https://about.gitlab.com/products/
+>>>>>>> upstream/master

qa/qa/page/merge_request/show.rb

@@ -2,8 +2,11 @@ module QA
   module Page
     module MergeRequest
       class Show < Page::Base
+<<<<<<< HEAD
         prepend QA::EE::Page::MergeRequest::Show
 
+=======
+>>>>>>> upstream/master
         view 'app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue' do
           element :merge_button
           element :fast_forward_message, 'Fast-forward merge without a merge commit'