Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-11-21

# Conflicts:
#	CHANGELOG.md
#	PHILOSOPHY.md
#	doc/user/discussions/index.md
#	doc/user/project/labels.md
#	locale/gitlab.pot

[ci skip]

.gitlab-ci.yml

@@ -798,7 +798,8 @@ gitlab:assets:compile:
       - webpack-report/
       - public/assets/
   tags:
-    - docker
+    - gitlab-org-delivery
+    - high-cpu
 
 karma:
   <<: *dedicated-no-docs-pull-cache-job

.rubocop.yml

@@ -50,7 +50,6 @@ Style/FrozenStringLiteralComment:
     - 'danger/**/*'
     - 'db/**/*'
     - 'ee/**/*'
-    - 'lib/gitlab/**/*'
     - 'lib/tasks/**/*'
     - 'qa/**/*'
     - 'rubocop/**/*'

CHANGELOG.md

@@ -4,17 +4,31 @@ entry.
 
 ## 11.5.0 (2018-11-22)
 
+<<<<<<< HEAD
 ### Security (9 changes, 1 of them is from the community)
 
 - Escape entity title while autocomplete template rendering to prevent XSS. !2556
 - Update moment to 2.22.2. !22648 (Takuya Noguchi)
 - Fix XSS in merge request source branch name.
+=======
+### Security (10 changes, 1 of them is from the community)
+
+- Escape entity title while autocomplete template rendering to prevent XSS. !2556
+- Update moment to 2.22.2. !22648 (Takuya Noguchi)
+- Redact personal tokens in unsubscribe links.
+>>>>>>> upstream/master
 - Escape user fullname while rendering autocomplete template to prevent XSS.
 - Persist only SHA digest of PersonalAccessToken#token.
 - Monkey kubeclient to not follow any redirects.
 - Prevent SSRF attacks in HipChat integration.
+<<<<<<< HEAD
 - Validate Wiki attachments are valid temporary files.
 - Redact personal tokens in unsubscribe links.
+=======
+- Prevent templated services from being imported.
+- Validate Wiki attachments are valid temporary files.
+- Fix XSS in merge request source branch name.
+>>>>>>> upstream/master
 
 ### Removed (2 changes)
 
@@ -82,6 +96,10 @@ entry.
 - Fix a race condition intermittently breaking GitLab startup. !23028
 - Adds margin after a deleted branch name in the activity feed. !23038
 - Ignore environment validation failure. !23100
+<<<<<<< HEAD
+=======
+- Fixes broken borders for reports section in MR widget.
+>>>>>>> upstream/master
 - Adds CI favicon back to jobs page.
 - Redirect to the pipeline builds page when a build is canceled. (Eva Kadlecova)
 - Fixed diff stats not showing when performance bar is enabled.
@@ -90,6 +108,7 @@ entry.
 - Fix bug causing not all emails to show up in commit email selectbox.
 - Remove duplicate escape in job sidebar.
 - Fixing styling issues on the scheduled pipelines page.
+<<<<<<< HEAD
 - Fixes broken test in master.
 - Renders stuck block when runners are stuck.
 - Removes extra border from test reports in the merge request widget.
@@ -97,6 +116,14 @@ entry.
 - Only render link to branch when branch still exists in pipeline page.
 - Fixed source project not filtering in merge request creation compare form.
 - Do not reload self on hooks when creating deployment.
+=======
+- Renders stuck block when runners are stuck.
+- Removes extra border from test reports in the merge request widget.
+- Only render link to branch when branch still exists in pipeline page.
+- Fixed source project not filtering in merge request creation compare form.
+- Do not reload self on hooks when creating deployment.
+- Fixes broken test in master.
+>>>>>>> upstream/master
 
 ### Changed (38 changes, 12 of them are from the community)
 
@@ -263,6 +290,13 @@ entry.
 - Disables stop environment button while the deploy is in progress.
 
 
+<<<<<<< HEAD
+=======
+## 11.4.7 (2018-11-20)
+
+- No changes.
+
+>>>>>>> upstream/master
 ## 11.4.6 (2018-11-18)
 
 ### Security (1 change)

PHILOSOPHY.md

-This document is intended to communicate the product philosophy GitLab uses in creating GitLab Enterprise Edition. The principles can be found in the [Product Section of the GitLab Handbook](https://about.gitlab.com/handbook/product/#product-at-gitlab).
\ No newline at end of file
+<<<<<<< HEAD
+This document is intended to communicate the product philosophy GitLab uses in creating GitLab Enterprise Edition. The principles can be found in the [Product Section of the GitLab Handbook](https://about.gitlab.com/handbook/product/#product-at-gitlab).
+=======
+This document is intended to communicate the product philosophy GitLab uses in creating GitLab Community Edition. The principles can be found in the [Product Section of the GitLab Handbook](https://about.gitlab.com/handbook/product/#product-at-gitlab).
+>>>>>>> upstream/master

VERSION

-11.5.0-pre
+11.6.0-pre

app/assets/javascripts/blob/file_template_mediator.js

@@ -124,7 +124,7 @@ export default class FileTemplateMediator {
 
   selectTemplateFile(selector, query, data) {
     selector.renderLoading();
-    // in case undo menu is already already there
+    // in case undo menu is already there
     this.destroyUndoMenu();
     this.fetchFileTemplate(selector.config.type, query, data)
       .then(file => {

app/assets/javascripts/boards/components/project_select.vue

@@ -48,10 +48,19 @@ export default {
       selectable: true,
       data: (term, callback) => {
         this.loading = true;
-        return Api.groupProjects(this.groupId, term, { with_issues_enabled: true }, projects => {
-          this.loading = false;
-          callback(projects);
-        });
+        return Api.groupProjects(
+          this.groupId,
+          term,
+          {
+            with_issues_enabled: true,
+            with_shared: false,
+            include_subgroups: true,
+          },
+          projects => {
+            this.loading = false;
+            callback(projects);
+          },
+        );
       },
       renderRow(project) {
         return `

app/assets/javascripts/labels.js

@@ -22,7 +22,7 @@ export default class Labels {
   updateColorPreview() {
     const previewColor = $('input#label_color').val();
     return $('div.label-color-preview').css('background-color', previewColor);
-    // Updates the the preview color with the hex-color input
+    // Updates the preview color with the hex-color input
   }
 
   // Updates the preview color with a click on a suggested color

app/assets/javascripts/project_select.js

@@ -14,6 +14,9 @@ export default function projectSelect() {
     this.orderBy = $(select).data('orderBy') || 'id';
     this.withIssuesEnabled = $(select).data('withIssuesEnabled');
     this.withMergeRequestsEnabled = $(select).data('withMergeRequestsEnabled');
+    this.withShared =
+      $(select).data('withShared') === undefined ? true : $(select).data('withShared');
+    this.includeProjectsInSubgroups = $(select).data('includeProjectsInSubgroups') || false;
     this.allowClear = $(select).data('allowClear') || false;
 
     placeholder = 'Search for project';
@@ -54,6 +57,8 @@ export default function projectSelect() {
               {
                 with_issues_enabled: _this.withIssuesEnabled,
                 with_merge_requests_enabled: _this.withMergeRequestsEnabled,
+                with_shared: _this.withShared,
+                include_subgroups: _this.includeProjectsInSubgroups,
               },
               projectsCallback,
             );

app/assets/javascripts/vue_merge_request_widget/components/deployment.vue

 <script>
+import { GlTooltipDirective } from '@gitlab/ui';
 import Icon from '~/vue_shared/components/icon.vue';
 import TooltipOnTruncate from '~/vue_shared/components/tooltip_on_truncate.vue';
 import FilteredSearchDropdown from '~/vue_shared/components/filtered_search_dropdown.vue';
 import { __ } from '~/locale';
 import timeagoMixin from '../../vue_shared/mixins/timeago';
-import tooltip from '../../vue_shared/directives/tooltip';
 import LoadingButton from '../../vue_shared/components/loading_button.vue';
 import { visitUrl } from '../../lib/utils/url_utility';
 import createFlash from '../../flash';
@@ -25,7 +25,7 @@ export default {
     ReviewAppLink,
   },
   directives: {
-    tooltip,
+    GlTooltip: GlTooltipDirective,
   },
   mixins: [timeagoMixin],
   props: {
@@ -42,6 +42,8 @@ export default {
     running: __('Deploying to'),
     success: __('Deployed to'),
     failed: __('Failed to deploy to'),
+    created: __('Will deploy to'),
+    canceled: __('Failed to deploy to'),
   },
   data() {
     return {
@@ -134,7 +136,7 @@ export default {
             </template>
             <span
               v-if="hasDeploymentTime"
-              v-tooltip
+              v-gl-tooltip
               :title="deployment.deployed_at_formatted"
               class="js-deploy-time"
             >
@@ -187,7 +189,7 @@ export default {
             </template>
             <span
               v-if="deployment.stop_url"
-              v-tooltip
+              v-gl-tooltip
               :title="deployInProgressTooltip"
               class="d-inline-block"
               tabindex="0"

app/models/concerns/blocks_json_serialization.rb

@@ -3,7 +3,7 @@
 # Overrides `as_json` and `to_json` to raise an exception when called in order
 # to prevent accidentally exposing attributes
 #
-# Not that that would ever happen... but just in case.
+# Not that would ever happen... but just in case.
 module BlocksJsonSerialization
   extend ActiveSupport::Concern
 

app/models/namespace.rb

@@ -190,7 +190,7 @@ class Namespace < ActiveRecord::Base
       .base_and_ancestors
   end
 
-  # returns all ancestors upto but excluding the the given namespace
+  # returns all ancestors upto but excluding the given namespace
   # when no namespace is given, all ancestors upto the top are returned
   def ancestors_upto(top = nil)
     Gitlab::GroupHierarchy.new(self.class.where(id: id))

app/services/ci/register_job_service.rb

@@ -36,7 +36,7 @@ module Ci
         builds = builds.with_any_tags
       end
 
-      builds.find do |build|
+      selection = builds.find do |build|
         next unless runner.can_pick?(build)
 
         begin
@@ -45,7 +45,7 @@ module Ci
           if assign_runner!(build, params)
             register_success(build)
 
-            return Result.new(build, true) # rubocop:disable Cop/AvoidReturnFromBlocks
+            break build
           end
         rescue StateMachines::InvalidTransition, ActiveRecord::StaleObjectError
           # We are looping to find another build that is not conflicting
@@ -61,6 +61,8 @@ module Ci
         end
       end
 
+      return Result.new(selection, true) if selection
+
       register_failure
       Result.new(nil, valid)
     end

app/services/commits/commit_patch_service.rb

@@ -7,7 +7,7 @@ module Commits
     # - user: `User` that will be the committer
     # - params:
     #   - branch_name: `String` the branch that will be committed into
-    #   - start_branch: `String` the branch that will will started from
+    #   - start_branch: `String` the branch that will be started from
     #   - patches: `Gitlab::Git::Patches::Collection` that contains the patches
     def initialize(*args)
       super

app/services/merge_requests/build_service.rb

@@ -10,6 +10,7 @@ module MergeRequests
       # TODO: this should handle all quick actions that don't have side effects
       # https://gitlab.com/gitlab-org/gitlab-ce/issues/53658
       merge_quick_actions_into_params!(merge_request, only: [:target_branch])
+      merge_request.merge_params['force_remove_source_branch'] = params.delete(:force_remove_source_branch) if params.has_key?(:force_remove_source_branch)
       merge_request.assign_attributes(params)
 
       merge_request.author = current_user

app/services/notification_service.rb

@@ -50,7 +50,7 @@ class NotificationService
 
   # Always notify the user about gpg key added
   #
-  # This is a security email so it will be sent even if the user user disabled
+  # This is a security email so it will be sent even if the user disabled
   # notifications
   def new_gpg_key(gpg_key)
     if gpg_key.user&.can?(:receive_notifications)

app/views/abuse_reports/new.html.haml

 - page_title _("Report abuse to GitLab")
 %h3.page-title
-  = _('Report abuse to GitLab')
+  = _("Report abuse to GitLab")
 %p
-  = _('Please use this form to report users to GitLab who create spam issues, comments or behave inappropriately.')
+  = _("Please use this form to report users to GitLab who create spam issues, comments or behave inappropriately.")
 %p
   = _("A member of GitLab's abuse team will review your report as soon as possible.")
 %hr
@@ -20,7 +20,7 @@
     .col-sm-10
       = f.text_area :message, class: "form-control", rows: 2, required: true, value: sanitize(@ref_url)
       .form-text.text-muted
-        = _('Explain the problem. If appropriate, provide a link to the relevant issue or comment.')
+        = _("Explain the problem. If appropriate, provide a link to the relevant issue or comment.")
 
   .form-actions
-    = f.submit "Send report", class: "btn btn-success"
+    = f.submit _("Send report"), class: "btn btn-success"

app/views/groups/issues.html.haml

@@ -9,7 +9,7 @@
     = render 'shared/issuable/nav', type: :issues
     .nav-controls
       = render 'shared/issuable/feed_buttons'
-      = render 'shared/new_project_item_select', path: 'issues/new', label: "New issue", type: :issues, with_feature_enabled: 'issues'
+      = render 'shared/new_project_item_select', path: 'issues/new', label: "New issue", type: :issues, with_feature_enabled: 'issues', with_shared: false, include_projects_in_subgroups: true
 
   = render 'shared/issuable/search_bar', type: :issues
 

app/views/groups/merge_requests.html.haml

@@ -7,7 +7,7 @@
     = render 'shared/issuable/nav', type: :merge_requests
     - if current_user
       .nav-controls
-        = render 'shared/new_project_item_select', path: 'merge_requests/new', label: "New merge request",  type: :merge_requests, with_feature_enabled: 'merge_requests'
+        = render 'shared/new_project_item_select', path: 'merge_requests/new', label: "New merge request",  type: :merge_requests, with_feature_enabled: 'merge_requests', with_shared: false, include_projects_in_subgroups: true
 
   = render 'shared/issuable/search_bar', type: :merge_requests
 

app/views/profiles/personal_access_tokens/index.html.haml

@@ -26,7 +26,7 @@
     %h4.prepend-top-0
       Feed token
     %p
-      Your feed token is used to authenticate you when your RSS reader loads a personalized RSS feed or when when your calendar application loads a personalized calendar, and is included in those feed URLs.
+      Your feed token is used to authenticate you when your RSS reader loads a personalized RSS feed or when your calendar application loads a personalized calendar, and is included in those feed URLs.
     %p
       It cannot be used to access any other data.
   .col-lg-8.feed-token-reset

app/views/shared/_new_project_item_select.html.haml

@@ -2,6 +2,6 @@
   .project-item-select-holder.btn-group
     %a.btn.btn-success.new-project-item-link.qa-new-project-item-link{ href: '', data: { label: local_assigns[:label], type: local_assigns[:type] } }
       = icon('spinner spin')
-    = project_select_tag :project_path, class: "project-item-select", data: { include_groups: local_assigns[:include_groups], order_by: 'last_activity_at', relative_path: local_assigns[:path] }, with_feature_enabled: local_assigns[:with_feature_enabled]
+    = project_select_tag :project_path, class: "project-item-select", data: { include_groups: local_assigns[:include_groups], order_by: 'last_activity_at', relative_path: local_assigns[:path], with_shared: local_assigns[:with_shared], include_projects_in_subgroups: local_assigns[:include_projects_in_subgroups] }, with_feature_enabled: local_assigns[:with_feature_enabled]
     %button.btn.btn-success.new-project-item-select-button.qa-new-project-item-select-button
       = icon('caret-down')

changelogs/unreleased/52453-show-subgroups-in-group-create-issue.yml

+---
+title: Fix project selector consistency in groups issues / MRs / boards pages
+merge_request: 22612
+author: Heinrich Lee Yu
+type: fixed

changelogs/unreleased/53578-fe-deployment-status.yml

+---
+title: Adds states to the deployment widget
+merge_request:
+author:
+type: added

changelogs/unreleased/54282-tooltip-stuck.yml

+---
+title: Fixes stuck tooltip on stop env button
+merge_request: 23244
+author:
+type: fixed

changelogs/unreleased/frozen-string-lib-rubocop.yml

+---
+title: Enable Rubocop on lib/gitlab
+merge_request:
+author: gfyoung
+type: other

changelogs/unreleased/kcj-add-philosophy.yml

+---
+title: Adds a PHILOSOPHY.md which references GitLab Product Handbook
+merge_request: 23200
+author:
+type: other

changelogs/unreleased/optimise-job-request.yml

+---
+title: Use cached size when passing artifacts to Runner
+merge_request:
+author:
+type: performance

changelogs/unreleased/sh-fix-issue-51220.yml

+---
+title: Handle force_remove_source_branch when creating merge request
+merge_request: 23281
+author:
+type: fixed

changelogs/unreleased/sh-fix-issue-54189.yml

----
-title: Prevent templated services from being imported
-merge_request:
-author:
-type: security

config/boot.rb

@@ -12,5 +12,5 @@ require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
 begin
   require 'bootsnap/setup'
 rescue LoadError
-  # bootsnap is optional dependency, so if we don't have it it's fine
+  # bootsnap is an optional dependency, so if we don't have it, it's fine
 end

db/migrate/20180628124813_alter_web_hook_logs_indexes.rb

@@ -12,7 +12,7 @@ class AlterWebHookLogsIndexes < ActiveRecord::Migration
   disable_ddl_transaction!
 
   # "created_at" comes first so the Sidekiq worker pruning old webhook logs can
-  # use a composite index index.
+  # use a composite index.
   #
   # We leave the old standalone index on "web_hook_id" in place so future code
   # that doesn't care about "created_at" can still use that index.

doc/api/README.md

@@ -112,7 +112,7 @@ not explicit. This allows for a stable API endpoint, but also means new
 features can be added to the API in the same version number.
 
 New features and bug fixes are released in tandem with a new GitLab, and apart
-from incidental patch and security releases, are released on the 22nd each
+from incidental patch and security releases, are released on the 22nd of each
 month. Backward incompatible changes (e.g. endpoints removal, parameters
 removal etc.), as well as removal of entire API versions are done in tandem
 with a major point release of GitLab itself. All deprecations and changes

doc/api/groups.md

@@ -152,8 +152,10 @@ Parameters:
 | `simple` | boolean | no | Return only the ID, URL, name, and path of each project |
 | `owned` | boolean | no | Limit by projects owned by the current user |
 | `starred` | boolean | no | Limit by projects starred by the current user |
-| `with_issues_enabled` | boolean | no | Limit by enabled issues feature |
-| `with_merge_requests_enabled` | boolean | no | Limit by enabled merge requests feature |
+| `with_issues_enabled` | boolean | no | Limit by projects with issues feature enabled. Default is `false` |
+| `with_merge_requests_enabled` | boolean | no | Limit by projects with merge requests feature enabled. Default is `false` |
+| `with_shared` | boolean | no | Include projects shared to this group. Default is `true` |
+| `include_subgroups` | boolean | no | Include projects in subgroups of this group. Default is `false` |
 | `with_custom_attributes` | boolean | no | Include [custom attributes](custom_attributes.md) in response (admins only) |
 
 Example response:

doc/api/wikis.md

@@ -65,14 +65,12 @@ curl --header "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" https://gitlab.example.com/a
 Example response:
 
 ```json
-[
-  {
-    "content" : "home page",
-    "format" : "markdown",
-    "slug" : "home",
-    "title" : "home"
-  }
-]
+{
+  "content" : "home page",
+  "format" : "markdown",
+  "slug" : "home",
+  "title" : "home"
+}
 ```
 
 ## Create a new wiki page

doc/ci/yaml/README.md

@@ -334,7 +334,7 @@ There are a few rules that apply to the usage of job policy:
 
 * `only` and `except` are inclusive. If both `only` and `except` are defined
    in a job specification, the ref is filtered by `only` and `except`.
-* `only` and `except` allow the use of regular expressions.
+* `only` and `except` allow the use of regular expressions (using [Ruby regexp syntax](https://ruby-doc.org/core/Regexp.html)).
 * `only` and `except` allow to specify a repository path to filter jobs for
    forks.
 

doc/security/rack_attack.md

@@ -35,9 +35,9 @@ For more information on how to use these options check out
     gitlab_rails['rack_attack_git_basic_auth'] = {
       'enabled' => true,
       'ip_whitelist' => ["127.0.0.1"],
-      'maxretry' => 10,
-      'findtime' => 60,
-      'bantime' => 3600
+      'maxretry' => 10, # Limit the number of Git HTTP authentication attempts per IP
+      'findtime' => 60, # Reset the auth attempt counter per IP after 60 seconds
+      'bantime' => 3600 # Ban an IP for one hour (3600s) after too many auth attempts
     }
     ```
 
@@ -55,9 +55,9 @@ The following settings can be configured:
 - `maxretry`: The maximum amount of times a request can be made in the
    specified time.
 - `findtime`: The maximum amount of time failed requests can count against an IP
-   before it's blacklisted.
-- `bantime`: The total amount of time that a blacklisted IP will be blocked in
-   seconds.
+   before it's blacklisted (in seconds).
+- `bantime`: The total amount of time that a blacklisted IP will be blocked (in
+   seconds).
 
 **Installations from source**
 

doc/user/discussions/index.md

@@ -274,6 +274,7 @@ edit existing comments. Non-team members are restricted from adding or editing c
 
 Additionally locked issues can not be reopened.
 
+<<<<<<< HEAD
 ## Merge Request Reviews **[PREMIUM]**
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4213) in GitLab 11.4.
@@ -337,6 +338,27 @@ bottom of the screen with two buttons:
 Alternatively, every pending comment has a button to finish the entire review.
 
 ![Review submission](img/review_preview.png)
+=======
+## Filtering notes
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/issues/26723) in GitLab 11.5. 
+
+For issues with many comments like activity notes and user comments, sometimes 
+finding useful information can be hard. There is a way to filter comments from single notes and discussions for merge requests and issues.  
+
+From a merge request's **Discussion** tab, or from an issue overview, find the filter's dropdown menu on the right side of the page, from which you can choose one of the following options:
+
+- **Show all activity**: displays all user comments and system notes
+(issue updates, mentions from other issues, changes to the description, etc).
+- **Show comments only**: only displays user comments in the list.
+- **Show history only**: only displays activity notes. 
+
+![Notes filters dropdown options](img/index_notes_filters.png)
+
+Once you select one of the filters in a given issue or MR, GitLab will save
+your preference, so that it will persist when you visit the same page again
+from any device you're logged into.
+>>>>>>> upstream/master
 
 [ce-5022]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5022
 [ce-7125]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7125

doc/user/project/labels.md

@@ -35,9 +35,12 @@ GitLab will add the following default labels to the project:
 
 To create a **group label**, follow similar steps from above to project labels. Navigate to **Issues > Labels** in the group and create it from there.
 This page only shows group labels in this group.
+<<<<<<< HEAD
 Alternatively, you can create group labels also from Epic sidebar. Please note that the created label will belong to the immediate group to which epic belongs.
 
 ![Create Labels from Epic](img/labels_epic_sidebar.png)
+=======
+>>>>>>> upstream/master
 
 Group labels appear in every label list page of the group's child projects.
 

doc/user/project/merge_requests/index.md

@@ -9,7 +9,7 @@ collaborate with other people on the same project.
 
 A Merge Request (**MR**) is the basis of GitLab as a code collaboration
 and version control platform.
-Is it simple as the name implies: a _request_ to _merge_ one branch into another.
+It is as simple as the name implies: a _request_ to _merge_ one branch into another.
 
 With GitLab merge requests, you can:
 

doc/user/project/pages/getting_started_part_three.md

 ---
-last_updated: 2018-08-16
+last_updated: 2018-11-19
 author: Marcia Ramos
 author_gitlab: marcia
 level: beginner
@@ -183,7 +183,7 @@ you can use the following setup:
 - In Cloudflare, create a DNS `A` record pointing `domain.com` to `35.185.44.232`
 - In GitLab, add the domain to GitLab Pages
 - In Cloudflare, create a DNS `TXT` record to verify your domain
-- In Cloudflare, create a DNS `CNAME` record poiting `www` to `domain.com`
+- In Cloudflare, create a DNS `CNAME` record pointing `www` to `domain.com`
 
 ## SSL/TLS Certificates
 

lib/api/entities.rb

@@ -1170,7 +1170,8 @@ module API
     end
 
     class JobArtifactFile < Grape::Entity
-      expose :filename, :size
+      expose :filename
+      expose :cached_size, as: :size
     end
 
     class JobArtifact < Grape::Entity

lib/api/groups.rb

@@ -71,7 +71,17 @@ module API
 
       def find_group_projects(params)
         group = find_group!(params[:id])
-        projects = GroupProjectsFinder.new(group: group, current_user: current_user, params: project_finder_params).execute
+        options = {
+          only_owned: !params[:with_shared],
+          include_subgroups: params[:include_subgroups]
+        }
+
+        projects = GroupProjectsFinder.new(
+          group: group,
+          current_user: current_user,
+          params: project_finder_params,
+          options: options
+        ).execute
         projects = projects.with_issues_available_for_user(current_user) if params[:with_issues_enabled]
         projects = projects.with_merge_requests_enabled if params[:with_merge_requests_enabled]
         projects = reorder_projects(projects)
@@ -244,6 +254,8 @@ module API
         optional :starred, type: Boolean, default: false, desc: 'Limit by starred status'
         optional :with_issues_enabled, type: Boolean, default: false, desc: 'Limit by enabled issues feature'
         optional :with_merge_requests_enabled, type: Boolean, default: false, desc: 'Limit by enabled merge requests feature'
+        optional :with_shared, type: Boolean, default: true, desc: 'Include projects shared to this group'
+        optional :include_subgroups, type: Boolean, default: false, desc: 'Includes projects in subgroups of this group'
 
         use :pagination
         use :with_custom_attributes

lib/gitlab/gfm/uploads_rewriter.rb

@@ -8,7 +8,7 @@ module Gitlab
     # Class that rewrites markdown links for uploads
     #
     # Using a pattern defined in `FileUploader` it copies files to a new
-    # project and rewrites all links to uploads in in a given text.
+    # project and rewrites all links to uploads in a given text.
     #
     #
     class UploadsRewriter

lib/gitlab/git/repository.rb

@@ -441,7 +441,7 @@ module Gitlab
         gitaly_ref_client.find_ref_name(sha, ref_path)
       end
 
-      # Get refs hash which key is is the commit id
+      # Get refs hash which key is the commit id
       # and value is a Gitlab::Git::Tag or Gitlab::Git::Branch
       # Note that both inherit from Gitlab::Git::Ref
       def refs_hash

lib/gitlab/i18n/po_linter.rb

@@ -251,7 +251,7 @@ module Gitlab
 
       def validate_variable_usage(errors, translation, required_variables)
         # We don't need to validate when the message is empty.
-        # In this case we fall back to the default, which has all the the
+        # In this case we fall back to the default, which has all the
         # required variables.
         return if translation.empty?
 

lib/gitlab/import/merge_request_creator.rb

@@ -6,10 +6,10 @@
 # used for rendering Markdown) are completely unnecessary and may even lead to
 # transaction timeouts.
 #
-# To ensure importing merge requests requests has a minimal impact and can
-# complete in a reasonable time we bypass all the hooks by inserting the row
-# and then retrieving it. We then only perform the additional work that is
-# strictly necessary.
+# To ensure importing merge requests has a minimal impact and can complete in
+# a reasonable time we bypass all the hooks by inserting the row and then
+# retrieving it. We then only perform the additional work that is strictly
+# necessary.
 module Gitlab
   module Import
     class MergeRequestCreator

locale/gitlab.pot

@@ -7349,6 +7349,9 @@ msgstr ""
 msgid "Send email"
 msgstr ""
 
+msgid "Send report"
+msgstr ""
+
 msgid "Send usage data"
 msgstr ""
 
@@ -9244,7 +9247,11 @@ msgstr ""
 msgid "Wiki|Wiki Pages"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "With contribution analytics you can have an overview for the activity of issues, merge requests and push events of your organization and its members."
+=======
+msgid "Will deploy to"
+>>>>>>> upstream/master
 msgstr ""
 
 msgid "Withdraw Access Request"

qa/qa/specs/features/browser_ui/3_create/repository/add_ssh_key_spec.rb

@@ -5,7 +5,7 @@ module QA
     describe 'SSH keys support' do
       let(:key_title) { "key for ssh tests #{Time.now.to_f}" }
 
-      it 'user adds and then removes an SSH key' do
+      it 'user adds and then removes an SSH key', :smoke do
         Runtime::Browser.visit(:gitlab, Page::Main::Login)
         Page::Main::Login.act { sign_in_using_credentials }
 

spec/controllers/projects/blob_controller_spec.rb

@@ -152,7 +152,7 @@ describe Projects::BlobController do
             expect(match_line['meta_data']).to have_key('new_pos')
           end
 
-          it 'does not add top match line when when "since" is equal 1' do
+          it 'does not add top match line when "since" is equal 1' do
             do_get(since: 1, to: 10, offset: 10, from_merge_request: true)
 
             match_line = JSON.parse(response.body).first

spec/features/merge_request/user_assigns_themselves_spec.rb

@@ -42,7 +42,7 @@ describe 'Merge request > User assigns themselves' do
       visit project_merge_request_path(project, merge_request)
     end
 
-    it 'does not not show assignment link' do
+    it 'does not show assignment link' do
       expect(page).not_to have_content 'Assign yourself'
     end
   end

spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb

@@ -325,7 +325,7 @@ describe 'Merge request > User resolves diff notes and discussions', :js do
         end
       end
 
-      it 'allows user user to mark all discussions as resolved' do
+      it 'allows user to mark all discussions as resolved' do
         page.all('.discussion-reply-holder', count: 2).each do |reply_holder|
           page.within reply_holder do
             click_button 'Resolve discussion'

spec/features/projects/wiki/user_creates_wiki_page_spec.rb

@@ -157,7 +157,7 @@ describe "User creates wiki page" do
         expect(page).to have_field("wiki[message]", with: "Create home")
       end
 
-      it "creates a page from from the home page" do
+      it "creates a page from the home page" do
         page.within(".wiki-form") do
           fill_in(:wiki_content, with: "My awesome wiki!")
 

spec/finders/pipeline_schedules_finder_spec.rb

@@ -12,7 +12,7 @@ describe PipelineSchedulesFinder do
     context 'when the scope is nil' do
       let(:params) { { scope: nil } }
 
-      it 'selects all pipeline pipeline schedules' do
+      it 'selects all pipeline schedules' do
         expect(subject.count).to be(2)
         expect(subject).to include(active_schedule, inactive_schedule)
       end

spec/fixtures/emails/paragraphs.eml

@@ -17,7 +17,7 @@ X-Received: by 10.0.0.1 with SMTP id n7mr11234144ipb.85.1371157428600; Thu,
  13 Jun 2013 14:03:48 -0700 (PDT)
 X-Scanned-By: MIMEDefang 2.69 on IPv6:2001:470:1d:165::1
 
-Is there any reason the *old* candy can't be be kept in silos while the new candy
+Is there any reason the *old* candy can't be kept in silos while the new candy
 is imported into *new* silos?
 
 The thing about candy is it stays delicious for a long time -- we can just keep

spec/initializers/secret_token_spec.rb

@@ -123,7 +123,7 @@ describe 'create_tokens' do
           create_tokens
         end
 
-        it 'sets the the keys to the values from the environment and secrets.yml' do
+        it 'sets the keys to the values from the environment and secrets.yml' do
           create_tokens
 
           expect(secrets.secret_key_base).to eq('secret_key_base')

spec/javascripts/ide/components/ide_spec.js

@@ -29,7 +29,7 @@ describe('ide component', () => {
     resetStore(vm.$store);
   });
 
-  it('does not render right right when no files open', () => {
+  it('does not render right when no files open', () => {
     expect(vm.$el.querySelector('.panel-right')).toBeNull();
   });
 

spec/javascripts/ide/stores/modules/branches/actions_spec.js

@@ -59,7 +59,7 @@ describe('IDE branches actions', () => {
   });
 
   describe('receiveBranchesError', () => {
-    it('should should commit error', done => {
+    it('should commit error', done => {
       testAction(
         receiveBranchesError,
         { search: TEST_SEARCH },

spec/javascripts/ide/stores/modules/merge_requests/actions_spec.js

@@ -39,7 +39,7 @@ describe('IDE merge requests actions', () => {
   });
 
   describe('receiveMergeRequestsError', () => {
-    it('should should commit error', done => {
+    it('should commit error', done => {
       testAction(
         receiveMergeRequestsError,
         { type: 'created', search: '' },

spec/javascripts/vue_mr_widget/components/deployment_spec.js

@@ -252,5 +252,33 @@ describe('Deployment component', () => {
         );
       });
     });
+
+    describe('created', () => {
+      beforeEach(() => {
+        vm = mountComponent(Component, {
+          deployment: Object.assign({}, deploymentMockData, { status: 'created' }),
+          showMetrics: true,
+        });
+      });
+
+      it('renders information about created deployment', () => {
+        expect(vm.$el.querySelector('.js-deployment-info').textContent).toContain('Will deploy to');
+      });
+    });
+
+    describe('canceled', () => {
+      beforeEach(() => {
+        vm = mountComponent(Component, {
+          deployment: Object.assign({}, deploymentMockData, { status: 'canceled' }),
+          showMetrics: true,
+        });
+      });
+
+      it('renders information about canceled deployment', () => {
+        expect(vm.$el.querySelector('.js-deployment-info').textContent).toContain(
+          'Failed to deploy to',
+        );
+      });
+    });
   });
 });

spec/lib/banzai/filter/absolute_link_filter_spec.rb

@@ -28,7 +28,7 @@ describe Banzai::Filter::AbsoluteLinkFilter do
         end
 
         context 'if relative_url_root is set' do
-          it 'joins the url without without doubling the path' do
+          it 'joins the url without doubling the path' do
             allow(Gitlab.config.gitlab).to receive(:url).and_return("#{fake_url}/gitlab/")
             doc = filter(link("/gitlab/foo", 'gfm'), only_path_context)
             expect(doc.at_css('a')['href']).to eq "#{fake_url}/gitlab/foo"

spec/lib/gitlab/auth/o_auth/user_spec.rb

@@ -498,7 +498,7 @@ describe Gitlab::Auth::OAuth::User do
     end
   end
 
-  describe 'ensure backwards compatibility with with sync email from provider option' do
+  describe 'ensure backwards compatibility with sync email from provider option' do
     let!(:existing_user) { create(:omniauth_user, extern_uid: 'my-uid', provider: 'my-provider') }
 
     before do

spec/lib/gitlab/ci/build/policy/changes_spec.rb

@@ -4,7 +4,7 @@ describe Gitlab::Ci::Build::Policy::Changes do
   set(:project) { create(:project) }
 
   describe '#satisfied_by?' do
-    describe 'paths matching matching' do
+    describe 'paths matching' do
       let(:pipeline) do
         build(:ci_empty_pipeline, project: project,
                                   ref: 'master',

spec/lib/gitlab/ci/config/external/file/local_spec.rb

@@ -37,7 +37,7 @@ describe Gitlab::Ci::Config::External::File::Local do
   end
 
   describe '#content' do
-    context 'with a a valid file' do
+    context 'with a valid file' do
       let(:local_file_content) do
         <<~HEREDOC
           before_script:

spec/lib/gitlab/ci/pipeline/expression/lexeme/string_spec.rb

@@ -93,7 +93,7 @@ describe Gitlab::Ci::Pipeline::Expression::Lexeme::String do
   end
 
   describe '#evaluate' do
-    it 'returns string value it is is present' do
+    it 'returns string value if it is present' do
       string = described_class.new('my string')
 
       expect(string.evaluate).to eq 'my string'

spec/lib/gitlab/contributions_calendar_spec.rb

@@ -135,7 +135,7 @@ describe Gitlab::ContributionsCalendar do
       expect(calendar(contributor).events_by_date(today)).to contain_exactly(e1, e2, e3)
     end
 
-    context 'when the user cannot read read cross project' do
+    context 'when the user cannot read cross project' do
       before do
         allow(Ability).to receive(:allowed?).and_call_original
         expect(Ability).to receive(:allowed?).with(user, :read_cross_project) { false }

spec/lib/gitlab/cross_project_access/check_info_spec.rb

@@ -50,7 +50,7 @@ describe Gitlab::CrossProjectAccess::CheckInfo do
       expect(info.should_run?(dummy_controller)).to be_truthy
     end
 
-    it 'returns the the opposite of #should_skip? when the check is a skip' do
+    it 'returns the opposite of #should_skip? when the check is a skip' do
       info = described_class.new({}, nil, nil, true)
 
       expect(info).to receive(:should_skip?).with(dummy_controller).and_return(false)
@@ -101,7 +101,7 @@ describe Gitlab::CrossProjectAccess::CheckInfo do
       expect(info.should_skip?(dummy_controller)).to be_truthy
     end
 
-    it 'returns the the opposite of #should_run? when the check is not a skip' do
+    it 'returns the opposite of #should_run? when the check is not a skip' do
       info = described_class.new({}, nil, nil, false)
 
       expect(info).to receive(:should_run?).with(dummy_controller).and_return(false)

spec/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_namespaces_spec.rb

@@ -165,7 +165,7 @@ describe Gitlab::Database::RenameReservedPathsMigration::V1::RenameNamespaces, :
   end
 
   describe '#rename_namespace_dependencies' do
-    it "moves the the repository for a project in the namespace" do
+    it "moves the repository for a project in the namespace" do
       create(:project, :repository, :legacy_storage, namespace: namespace, path: "the-path-project")
       expected_repo = File.join(TestEnv.repos_path, "the-path0", "the-path-project.git")
 

spec/lib/gitlab/diff/inline_diff_marker_spec.rb

@@ -16,7 +16,7 @@ describe Gitlab::Diff::InlineDiffMarker do
       end
     end
 
-    context "when the text text is not html safe" do
+    context "when the text is not html safe" do
       let(:rich) { "abc 'def' differs" }
 
       it 'marks the range' do

spec/lib/gitlab/email/reply_parser_spec.rb

@@ -49,7 +49,7 @@ describe Gitlab::Email::ReplyParser do
       expect(test_parse_body(fixture_file("emails/paragraphs.eml")))
         .to eq(
           <<-BODY.strip_heredoc.chomp
-            Is there any reason the *old* candy can't be be kept in silos while the new candy
+            Is there any reason the *old* candy can't be kept in silos while the new candy
             is imported into *new* silos?
 
             The thing about candy is it stays delicious for a long time -- we can just keep

spec/lib/gitlab/git/merge_base_spec.rb

@@ -82,7 +82,7 @@ describe Gitlab::Git::MergeBase do
   end
 
   describe '#unknown_refs', :missing_ref do
-    it 'returns the the refs passed that are not part of the repository' do
+    it 'returns the refs passed that are not part of the repository' do
       expect(merge_base.unknown_refs).to contain_exactly('aaaa')
     end
 

spec/lib/gitlab/multi_collection_paginator_spec.rb

@@ -28,7 +28,7 @@ describe Gitlab::MultiCollectionPaginator do
       expect(paginator.paginate(1)).to eq(all_projects.take(3))
     end
 
-    it 'fils the second page with a mixture of of the first & second collection' do
+    it 'fils the second page with a mixture of the first & second collection' do
       first_collection_element = all_projects.last
       second_collection_elements = all_groups.take(2)
 

spec/models/ci/build_trace_chunk_spec.rb

@@ -45,11 +45,11 @@ describe Ci::BuildTraceChunk, :clean_gitlab_redis_shared_state do
       is_expected.to eq(%w[redis database fog])
     end
 
-    it 'returns redis store as the the lowest precedence' do
+    it 'returns redis store as the lowest precedence' do
       expect(subject.first).to eq('redis')
     end
 
-    it 'returns fog store as the the highest precedence' do
+    it 'returns fog store as the highest precedence' do
       expect(subject.last).to eq('fog')
     end
   end

spec/models/list_spec.rb

@@ -22,13 +22,13 @@ describe List do
   end
 
   describe '#destroy' do
-    it 'can be destroyed when when list_type is set to label' do
+    it 'can be destroyed when list_type is set to label' do
       subject = create(:list)
 
       expect(subject.destroy).to be_truthy
     end
 
-    it 'can not be destroyed when when list_type is set to closed' do
+    it 'can not be destroyed when list_type is set to closed' do
       subject = create(:closed_list)
 
       expect(subject.destroy).to be_falsey

spec/policies/ci/pipeline_schedule_policy_spec.rb

@@ -70,7 +70,7 @@ describe Ci::PipelineSchedulePolicy, :models do
         pipeline_schedule.update(owner: user)
       end
 
-      it 'includes abilities to do do all operations on pipeline schedule' do
+      it 'includes abilities to do all operations on pipeline schedule' do
         expect(policy).to be_allowed :play_pipeline_schedule
         expect(policy).to be_allowed :update_pipeline_schedule
         expect(policy).to be_allowed :admin_pipeline_schedule
@@ -82,7 +82,7 @@ describe Ci::PipelineSchedulePolicy, :models do
         project.add_maintainer(user)
       end
 
-      it 'includes abilities to do do all operations on pipeline schedule' do
+      it 'includes abilities to do all operations on pipeline schedule' do
         expect(policy).to be_allowed :play_pipeline_schedule
         expect(policy).to be_allowed :update_pipeline_schedule
         expect(policy).to be_allowed :admin_pipeline_schedule

spec/policies/project_policy_spec.rb

@@ -223,7 +223,7 @@ describe ProjectPolicy do
         expect_disallowed(*other_write_abilities)
       end
 
-      it 'does not disable other other abilities' do
+      it 'does not disable other abilities' do
         expect_allowed(*(regular_abilities - feature_write_abilities - other_write_abilities))
       end
     end

spec/requests/api/groups_spec.rb

@@ -534,7 +534,7 @@ describe API::Groups do
         expect(json_response.first['visibility']).not_to be_present
       end
 
-      it 'filters the groups projects' do
+      it "filters the groups projects" do
         public_project = create(:project, :public, path: 'test1', group: group1)
 
         get api("/groups/#{group1.id}/projects", user1), visibility: 'public'
@@ -546,6 +546,32 @@ describe API::Groups do
         expect(json_response.first['name']).to eq(public_project.name)
       end
 
+      it "returns projects excluding shared" do
+        create(:project_group_link, project: create(:project), group: group1)
+        create(:project_group_link, project: create(:project), group: group1)
+        create(:project_group_link, project: create(:project), group: group1)
+
+        get api("/groups/#{group1.id}/projects", user1), with_shared: false
+
+        expect(response).to have_gitlab_http_status(200)
+        expect(response).to include_pagination_headers
+        expect(json_response).to be_an(Array)
+        expect(json_response.length).to eq(2)
+      end
+
+      it "returns projects including those in subgroups", :nested_groups do
+        subgroup = create(:group, parent: group1)
+        create(:project, group: subgroup)
+        create(:project, group: subgroup)
+
+        get api("/groups/#{group1.id}/projects", user1), include_subgroups: true
+
+        expect(response).to have_gitlab_http_status(200)
+        expect(response).to include_pagination_headers
+        expect(json_response).to be_an(Array)
+        expect(json_response.length).to eq(4)
+      end
+
       it "does not return a non existing group" do
         get api("/groups/1328/projects", user1)
 

spec/services/merge_requests/build_service_spec.rb

@@ -21,15 +21,20 @@ describe MergeRequests::BuildService do
   let(:commit_2) { double(:commit_2, sha: 'f00ba7', safe_message: 'This is a bad commit message!') }
   let(:commits) { nil }
 
+  let(:params) do
+    {
+      description: description,
+      source_branch: source_branch,
+      target_branch: target_branch,
+      source_project: source_project,
+      target_project: target_project,
+      milestone_id: milestone_id,
+      label_ids: label_ids
+    }
+  end
+
   let(:service) do
-    described_class.new(project, user,
-                                    description: description,
-                                    source_branch: source_branch,
-                                    target_branch: target_branch,
-                                    source_project: source_project,
-                                    target_project: target_project,
-                                    milestone_id: milestone_id,
-                                    label_ids: label_ids)
+    described_class.new(project, user, params)
   end
 
   before do
@@ -56,6 +61,19 @@ describe MergeRequests::BuildService do
       merge_request
     end
 
+    it 'does not assign force_remove_source_branch' do
+      expect(merge_request.force_remove_source_branch?).to be_falsey
+    end
+
+    context 'with force_remove_source_branch parameter' do
+      let(:mr_params) { params.merge(force_remove_source_branch: '1') }
+      let(:merge_request) { described_class.new(project, user, mr_params).execute }
+
+      it 'assigns force_remove_source_branch' do
+        expect(merge_request.force_remove_source_branch?).to be_truthy
+      end
+    end
+
     context 'missing source branch' do
       let(:source_branch) { '' }
 

spec/services/merge_requests/merge_when_pipeline_succeeds_service_spec.rb

@@ -95,7 +95,7 @@ describe MergeRequests::MergeWhenPipelineSucceedsService do
                              sha: '1234abcdef', status: 'success')
       end
 
-      it 'it does not merge merge request' do
+      it 'it does not merge request' do
         expect(MergeWorker).not_to receive(:perform_async)
         service.trigger(old_pipeline)
       end

spec/services/users/set_status_service_spec.rb

@@ -7,7 +7,7 @@ describe Users::SetStatusService do
   subject(:service) { described_class.new(current_user, params) }
 
   describe '#execute' do
-    context 'when when params are set' do
+    context 'when params are set' do
       let(:params) { { emoji: 'taurus', message: 'a random status' } }
 
       it 'creates a status' do

spec/support/import_export/export_file_helper.rb

@@ -123,7 +123,7 @@ module ExportFileHelper
     false
   end
 
-  # Compares model attributes with those those found in the hash
+  # Compares model attributes with those found in the hash
   # and returns true if there is a match, ignoring some excluded attributes.
   def safe_model?(model, excluded_attributes, parent)
     excluded_attributes += associations_for(model)