Fix conflicts after CE Upstream update

CHANGELOG.md

@@ -4,10 +4,6 @@ entry.
 
 ## 8.14.0 (2016-11-22)
 
-<<<<<<< HEAD
-- Add time tracking support for Issues and Merge Requests. !870
-=======
->>>>>>> ce/master
 - Use separate email-token for incoming email and revert back the inactive feature. !5914
 - API: allow recursive tree request. !6088 (Rebeca Mendez)
 - Replace jQuery.timeago with timeago.js. !6274 (ClemMakesApps)
@@ -15,12 +11,6 @@ entry.
 - Add button to delete all merged branches. !6449 (Toon Claes)
 - Finer-grained Git gargage collection. !6588
 - Introduce better credential and error checking to `rake gitlab:ldap:check`. !6601
-<<<<<<< HEAD
-- Make system notes less intrusive. !6755
-- Process commits using a dedicated Sidekiq worker. !6802
-- Precalculate user's authorized projects in database. !6839
-- Show avatars in mention dropdown. !6865
-=======
 - Centralize LDAP config/filter logic. !6606
 - Make system notes less intrusive. !6755
 - Process commits using a dedicated Sidekiq worker. !6802
@@ -29,17 +19,13 @@ entry.
 - Fix record not found error on NewNoteWorker processing. !6863 (Oswaldo Ferreira)
 - Show avatars in mention dropdown. !6865
 - Fix expanding a collapsed diff when converting a symlink to a regular file. !6953
->>>>>>> ce/master
 - Defer saving project services to the database if there are no user changes. !6958
 - Omniauth auto link LDAP user falls back to find by DN when user cannot be found by UID. !7002
 - Display "folders" for environments. !7015
 - Make it possible to trigger builds from webhooks. !7022 (Dmitry Poray)
 - Fix showing pipeline status for a given commit from correct branch. !7034
-<<<<<<< HEAD
-=======
 - Add link to build pipeline within individual build pages. !7082
 - Add api endpoint `/groups/owned`. !7103 (Borja Aparicio)
->>>>>>> ce/master
 - Add query param to filter users by external & blocked type. !7109 (Yatish Mehta)
 - Issues atom feed url reflect filters on dashboard. !7114 (Lucas Deschamps)
 - Add setting to only allow merge requests to be merged when all discussions are resolved. !7125 (Rodolfo Arruda)
@@ -53,14 +39,6 @@ entry.
 - Only skip group when it's actually a group in the "Share with group" select. !7262
 - Introduce round-robin project creation to spread load over multiple shards. !7266
 - Ensure merge request's "remove branch" accessors return booleans. !7267
-<<<<<<< HEAD
-- Expose label IDs in API. !7275 (Rares Sfirlogea)
-- Fix invalid filename validation on eslint. !7281
-- API: Ability to retrieve version information. !7286 (Robert Schilling)
-- Set default Sidekiq retries to 3. !7294
-- Fix double event and ajax request call on MR page. !7298 (YarNayar)
-- Unify anchor link format for MR diff files. !7298 (YarNayar)
-=======
 - Fix no "Register" tab if ldap auth is enabled (#24038). !7274 (Luc Didry)
 - Expose label IDs in API. !7275 (Rares Sfirlogea)
 - Fix invalid filename validation on eslint. !7281
@@ -71,15 +49,10 @@ entry.
 - Unify anchor link format for MR diff files. !7298 (YarNayar)
 - Require projects before creating milestone. !7301 (gfyoung)
 - Fix error when using invalid branch name when creating a new pipeline. !7324
->>>>>>> ce/master
 - Return 400 when creating a system hook fails. !7350 (Robert Schilling)
 - Auto-close environment when branch is deleted. !7355
 - Rework cache invalidation so only changed data is refreshed. !7360
 - Navigation bar issuables counters reflects dashboard issuables counters. !7368 (Lucas Deschamps)
-<<<<<<< HEAD
-- fixes 500 error on project show when user is not logged in and project is still empty. !7376
-- Add support for reply-by-email when the email only contains HTML. !7397
-=======
 - Fix cache for commit status in commits list to respect branches. !7372
 - fixes 500 error on project show when user is not logged in and project is still empty. !7376
 - Removed gray button styling from todo buttons in sidebars. !7387
@@ -92,7 +65,6 @@ entry.
 - Give search-input correct padding-right value. !7407 (Philip Karpiak)
 - Remove additional padding on right-aligned items in MR widget. !7411 (Didem Acet)
 - Fix issue causing Labels not to appear in sidebar on MR page. !7416 (Alex Sanford)
->>>>>>> ce/master
 - Allow mail_room idle_timeout option to be configurable. !7423
 - Fix misaligned buttons on admin builds page. !7424 (Didem Acet)
 - Disable "Request Access" functionality by default for new projects and groups. !7425
@@ -128,36 +100,6 @@ entry.
 - Fix 500 error when group name ends with git. !7630
 - Fix undefined error in CI linter. !7650
 - Show events per stage on Cycle Analytics page. !23449
-<<<<<<< HEAD
-- Fix JIRA references for project snippets.
-- Allow enabling and disabling commit and MR events for JIRA.
-- simplify url generation. (Jarka Kadlecova)
-- Fix broken commits search.
-- Clicking "force remove source branch" label now toggles the checkbox again.
-- Fixing the issue of the project fork url giving 500 when not signed instead of being redirected to sign in page. (Cagdas Gerede)
-- Fix: Guest sees some repository details and gets 404.
-- More aggressively preload on merge request and issue index pages.
-- Added permissions per stage to cycle analytics endpoint.
-- Allow commit note to be visible if repo is visible.
-- Redesign pipelines page.
-- Add placeholder for the example text for custom hex color on label creation popup. (Luis Alonso Chavez Armendariz)
-- Add an index for project_id in project_import_data to improve performance.
-- Assignee dropdown now searches author of issue or merge request.
-- Bump omniauth-gitlab to 1.0.2 to fix incompatibility with omniauth-oauth2.
-- Fix broken link to observatory cli on Frontend Dev Guide. (Sam Rose)
-- Search for a filename in a project.
-- Fix: Todos Filter Shows All Users.
-- Allow sorting groups in the API.
-- Add environment info to builds page.
-- Use the Gitlab Workhorse HTTP header in the admin dashboard. (Chris Wright)
-- Add events per stage to cycle analytics.
-- Fixed multiple requests sent when opening dropdowns.
-- Faster search inside Project.
-- Add logging for rack attack events to production.log.
-- Fixed issue boards counter border when unauthorized.
-- Add JIRA remotelinks and prevent duplicated closing messages.
-- Allow to test JIRA service settings without having a repository.
-=======
 - Add JIRA remotelinks and prevent duplicated closing messages.
 - Fixed issue boards counter border when unauthorized.
 - Add placeholder for the example text for custom hex color on label creation popup. (Luis Alonso Chavez Armendariz)
@@ -187,7 +129,6 @@ entry.
 - Fix JIRA references for project snippets.
 - Allow enabling and disabling commit and MR events for JIRA.
 - simplify url generation. (Jarka Kadlecova)
->>>>>>> ce/master
 - Show correct environment log in admin/logs (@duk3luk3 !7191)
 - Fix Milestone dropdown not stay selected for `Upcoming` and `No Milestone` option !7117
 - Diff collapse won't shift when collapsing.

VERSION

-<<<<<<< HEAD
 8.14.0-ee-pre
-=======
-8.15.0-pre
->>>>>>> ce/master

app/controllers/projects/notes_controller.rb

@@ -198,10 +198,7 @@ class Projects::NotesController < Projects::ApplicationController
     end
 
     attrs[:commands_changes] = note.commands_changes unless attrs[:award]
-<<<<<<< HEAD
 
-=======
->>>>>>> ce/master
     attrs
   end
 

app/models/project_team.rb

@@ -196,7 +196,6 @@ class ProjectTeam
   def group
     project.group
   end
-<<<<<<< HEAD
 
   def group_member_lock
     group && group.membership_lock
@@ -205,40 +204,4 @@ class ProjectTeam
   def merge_max!(first_hash, second_hash)
     first_hash.merge!(second_hash) { |_key, old, new| old > new ? old : new }
   end
-
-  def project_shared_with_group?
-    project.invited_groups.any? && project.allowed_to_share_with_group?
-  end
-
-  def fetch_invited_members(level = nil)
-    invited_members = []
-
-    return invited_members unless project_shared_with_group?
-
-    project.project_group_links.includes(group: [:group_members]).each do |link|
-      invited_group_members = link.group.members
-
-      if level
-        numeric_level = GroupMember.access_level_roles[level.to_s.singularize.titleize]
-
-        # If we're asked for a level that's higher than the group's access,
-        # there's nothing left to do
-        next if numeric_level > link.group_access
-
-        # Make sure we include everyone _above_ the requested level as well
-        invited_group_members =
-          if numeric_level == link.group_access
-            invited_group_members.where("access_level >= ?", link.group_access)
-          else
-            invited_group_members.public_send(level)
-          end
-      end
-
-      invited_members << invited_group_members
-    end
-
-    invited_members.flatten.compact
-  end
-=======
->>>>>>> ce/master
 end

spec/controllers/autocomplete_controller_spec.rb

@@ -12,10 +12,7 @@ describe AutocompleteController do
       before do
         sign_in(user)
         project.add_master(user)
-<<<<<<< HEAD
         project.add_developer(user2)
-=======
->>>>>>> ce/master
       end
 
       describe 'GET #users with project ID' do

spec/lib/gitlab/import_export/all_models.yml

@@ -195,7 +195,8 @@ project:
 - environments
 - deployments
 - project_feature
-<<<<<<< HEAD
+- authorized_users
+- project_authorizations
 - mirror_user
 - push_rule
 - jenkins_service
@@ -207,10 +208,6 @@ project:
 - remote_mirrors
 - path_locks
 - approver_groups
-=======
-- authorized_users
-- project_authorizations
->>>>>>> ce/master
 award_emoji:
 - awardable
 - user

spec/models/project_spec.rb

@@ -1738,7 +1738,6 @@ describe Project, models: true do
     end
   end
 
-<<<<<<< HEAD
   describe '#find_path_lock' do
     let(:project) { create :empty_project }
     let(:path_lock) { create :path_lock, project: project }
@@ -1753,57 +1752,6 @@ describe Project, models: true do
     end
   end
 
-  describe 'authorized_for_user' do
-    let(:group) { create(:group) }
-    let(:developer) { create(:user) }
-    let(:master) { create(:user) }
-    let(:personal_project) { create(:project, namespace: developer.namespace) }
-    let(:group_project) { create(:project, namespace: group) }
-    let(:members_project) { create(:project) }
-    let(:shared_project) { create(:project) }
-
-    before do
-      group.add_master(master)
-      group.add_developer(developer)
-
-      members_project.team << [developer, :developer]
-      members_project.team << [master, :master]
-
-      create(:project_group_link, project: shared_project, group: group, group_access: Gitlab::Access::DEVELOPER)
-    end
-
-    it 'returns false for no user' do
-      expect(personal_project.authorized_for_user?(nil)).to be(false)
-    end
-
-    it 'returns true for personal projects of the user' do
-      expect(personal_project.authorized_for_user?(developer)).to be(true)
-    end
-
-    it 'returns true for projects of groups the user is a member of' do
-      expect(group_project.authorized_for_user?(developer)).to be(true)
-    end
-
-    it 'returns true for projects for which the user is a member of' do
-      expect(members_project.authorized_for_user?(developer)).to be(true)
-    end
-
-    it 'returns true for projects shared on a group the user is a member of' do
-      expect(shared_project.authorized_for_user?(developer)).to be(true)
-    end
-
-    it 'checks for the correct minimum level access' do
-      expect(group_project.authorized_for_user?(developer, Gitlab::Access::MASTER)).to be(false)
-      expect(group_project.authorized_for_user?(master, Gitlab::Access::MASTER)).to be(true)
-      expect(members_project.authorized_for_user?(developer, Gitlab::Access::MASTER)).to be(false)
-      expect(members_project.authorized_for_user?(master, Gitlab::Access::MASTER)).to be(true)
-      expect(shared_project.authorized_for_user?(developer, Gitlab::Access::MASTER)).to be(false)
-      expect(shared_project.authorized_for_user?(master, Gitlab::Access::MASTER)).to be(false)
-      expect(shared_project.authorized_for_user?(developer, Gitlab::Access::DEVELOPER)).to be(true)
-      expect(shared_project.authorized_for_user?(master, Gitlab::Access::DEVELOPER)).to be(true)
-    end
-  end
-
   describe '#change_repository_storage' do
     let(:project) { create(:project, repository_storage: 'a') }
     let(:read_only_project) { create(:project, repository_storage: 'a', repository_read_only: true) }
@@ -1851,8 +1799,6 @@ describe Project, models: true do
     end
   end
 
-=======
->>>>>>> ce/master
   describe 'change_head' do
     let(:project) { create(:project) }