Merge branch 'ce-to-ee-2017-05-17' of gitlab.com:gitlab-org/gitlab-ee into ce-to-ee-2017-05-17

app/assets/stylesheets/pages/merge_requests.scss

@@ -722,10 +722,6 @@
 
   &.affix {
     left: 0;
-<<<<<<< HEAD
-    z-index: 100;
-=======
->>>>>>> upstream/master
     transition: right .15s;
 
     @media (max-width: $screen-xs-max) {

app/services/issuable_base_service.rb

@@ -178,7 +178,6 @@ class IssuableBaseService < BaseService
       after_create(issuable)
       issuable.create_cross_references!(current_user)
       execute_hooks(issuable)
-      issuable.assignees.each(&:invalidate_cache_counts)
       invalidate_cache_counts(issuable.assignees, issuable)
     end
 

app/workers/post_receive.rb

@@ -31,17 +31,10 @@ class PostReceive
   def process_repository_update(post_received)
     changes = []
     refs = Set.new
-<<<<<<< HEAD
 
     post_received.changes_refs do |oldrev, newrev, ref|
       @user ||= post_received.identify(newrev)
 
-=======
-
-    post_received.changes_refs do |oldrev, newrev, ref|
-      @user ||= post_received.identify(newrev)
-
->>>>>>> upstream/master
       unless @user
         log("Triggered hook for non-existing user \"#{post_received.identifier}\"")
         return false

doc/user/admin_area/settings/usage_statistics.md

@@ -28,64 +28,6 @@ for all signed in users.
 [were added][ee-735] in GitLab Enterprise Edition
 8.12. [Moved to GitLab Community Edition][ce-23361] in 9.1.
 
-<<<<<<< HEAD
-GitLab Inc. can collect non-sensitive information about how GitLab users
-use their GitLab instance upon the activation of a ping feature
-located in the admin panel (`/admin/application_settings`).
-
-You can see the **exact** JSON payload that your instance sends to GitLab
-in the "Usage statistics" section of the admin panel.
-
-Nothing qualitative is collected. Only quantitative. That means no project
-names, author names, comment bodies, names of labels, etc.
-
-The usage ping is sent in order for GitLab Inc. to have a better understanding
-of how our users use our product, and to be more data-driven when creating or
-changing features.
-
-The total number of the following is sent back to GitLab Inc.:
-
-- Comments
-- Groups
-- Users
-- Projects
-- Issues
-- Labels
-- CI builds
-- Snippets
-- Milestones
-- Todos
-- Pushes
-- Merge requests
-- Environments
-- Triggers
-- Deploy keys
-- Pages
-- Project Services
-- Projects using the Prometheus service
-- Issue Boards
-- CI Runners
-- Deployments
-- Geo Nodes
-- LDAP Groups
-- LDAP Keys
-- LDAP Users
-- LFS objects
-- Protected branches
-- Releases
-- Remote mirrors
-- Service Desk projects
-- Service Desk issues
-- Uploads
-- Web hooks
-
-Also, we track if you've installed Mattermost with GitLab.
-For example: `"mattermost_enabled":true"`.
-
-More data will be added over time. The goal of this ping is to be as light as
-possible, so it won't have any performance impact on your installation when
-the calculation is made.
-=======
 GitLab sends a weekly payload containing usage data to GitLab Inc. The usage
 ping uses high-level data to help our product, support, and sales teams. It does
 not send any project names, usernames, or any other specific data. The
@@ -93,7 +35,6 @@ information from the usage ping is not anonymous, it is linked to the hostname
 of the instance.
 
 You can view the exact JSON payload in the administration panel.
->>>>>>> upstream/master
 
 ### Deactivate the usage ping
 

lib/gitlab/gitaly_client/commit.rb

@@ -29,31 +29,12 @@ module Gitlab
         Gitlab::Git::DiffCollection.new(response, options)
       end
 
-<<<<<<< HEAD
-      class << self
-        def diff_from_parent(commit, options = {})
-          repository = commit.project.repository
-          gitaly_repo = repository.gitaly_repository
-          stub = Gitaly::Diff::Stub.new(nil, nil, channel_override: repository.gitaly_channel)
-          parent = commit.parents[0]
-          parent_id = parent ? parent.id : EMPTY_TREE_ID
-          request = Gitaly::CommitDiffRequest.new(
-            repository: gitaly_repo,
-            left_commit_id: parent_id,
-            right_commit_id: commit.id,
-            ignore_whitespace_change: options.fetch(:ignore_whitespace_change, false),
-            paths: options.fetch(:paths, [])
-          )
-
-          Gitlab::Git::DiffCollection.new(stub.commit_diff(request), options)
-=======
       def commit_deltas(commit)
         request_params = commit_diff_request_params(commit)
 
         response = diff_service_stub.commit_delta(Gitaly::CommitDeltaRequest.new(request_params))
         response.flat_map do |msg|
           msg.deltas.map { |d| Gitlab::Git::Diff.new(d) }
->>>>>>> upstream/master
         end
       end
 

spec/lib/gitlab/workhorse_spec.rb

@@ -202,11 +202,7 @@ describe Gitlab::Workhorse, lib: true do
     context 'when Gitaly is enabled' do
       let(:gitaly_params) do
         {
-<<<<<<< HEAD
-          GitalyAddress: Gitlab::GitalyClient.get_address('default')
-=======
           GitalyAddress: Gitlab::GitalyClient.address('default')
->>>>>>> upstream/master
         }
       end