Fix conflicts

app/assets/stylesheets/pages/members.scss

@@ -140,7 +140,6 @@
   }
 }
 
-<<<<<<< HEAD
 .members-ldap {
   -webkit-align-self: center;
   align-self: center;
@@ -184,7 +183,7 @@
     width: auto;
   }
 }
-=======
+
 .flex-project-members-panel {
   display: flex;
   flex-direction: row;
@@ -236,4 +235,3 @@
     }
   }
 }
->>>>>>> ce/master

app/helpers/milestones_helper.rb

@@ -116,7 +116,6 @@ module MilestonesHelper
     end
   end
 
-<<<<<<< HEAD
   def data_warning_for(burndown)
     return unless burndown
 
@@ -131,7 +130,9 @@ module MilestonesHelper
       message += link_to "About burndown charts", help_page_path('user/project/milestones/index', anchor: 'burndown-charts'), class: 'burndown-docs-link'
 
       content_tag(:div, message.html_safe, id: "data-warning", class: "settings-message prepend-top-20")
-=======
+    end
+  end
+
   def milestone_merge_request_tab_path(milestone)
     if @project
       merge_requests_namespace_project_milestone_path(@project.namespace, @project, milestone, format: :json)
@@ -153,7 +154,6 @@ module MilestonesHelper
       labels_namespace_project_milestone_path(@project.namespace, @project, milestone, format: :json)
     elsif @group
       labels_group_milestone_path(@group, milestone.safe_title, title: milestone.title, format: :json)
->>>>>>> ce/master
     end
   end
 end

app/helpers/tree_helper.rb

@@ -88,11 +88,7 @@ module TreeHelper
         part_path = part if part_path.empty?
 
         next if parts.count > max_links && !parts.last(2).include?(part)
-<<<<<<< HEAD
-        yield(part, tree_join(@ref, part_path), part_path)
-=======
         yield(part, part_path)
->>>>>>> ce/master
       end
     end
   end

app/models/project.rb

@@ -1487,7 +1487,6 @@ class Project < ActiveRecord::Base
 
   rescue ActiveRecord::RecordNotSaved => e
     handle_update_attribute_error(e, value)
-<<<<<<< HEAD
   end
 
   def change_repository_storage(new_repository_storage_key)
@@ -1498,8 +1497,6 @@ class Project < ActiveRecord::Base
 
     run_after_commit { ProjectUpdateRepositoryStorageWorker.perform_async(id, new_repository_storage_key) }
     self.repository_read_only = true
-=======
->>>>>>> ce/master
   end
 
   def pushes_since_gc

app/validators/dynamic_path_validator.rb

@@ -124,7 +124,6 @@ class DynamicPathValidator < ActiveModel::EachValidator
     milestones
     projects
     subgroups
-<<<<<<< HEAD
     analytics
     audit_events
     hooks
@@ -132,8 +131,6 @@ class DynamicPathValidator < ActiveModel::EachValidator
     ldap_group_links
     notification_setting
     pipeline_quota
-=======
->>>>>>> ce/master
   ].freeze
 
   CHILD_ROUTES = (WILDCARD_ROUTES | GROUP_ROUTES).freeze

app/views/projects/blob/_blob.html.haml

@@ -6,23 +6,14 @@
     %li
       = link_to namespace_project_tree_path(@project.namespace, @project, @ref) do
         = @project.path
-<<<<<<< HEAD
-    - tree_breadcrumbs(@tree, 6) do |title, path, part_path|
-=======
     - path_breadcrumbs do |title, path|
       - title = truncate(title, length: 40)
->>>>>>> ce/master
       %li
         - if path == @path
           = link_to namespace_project_blob_path(@project.namespace, @project, tree_join(@ref, path)) do
             %strong= title
         - else
-<<<<<<< HEAD
-          = link_to title, '#'
-        = render_lock_icon(part_path)
-=======
           = link_to title, namespace_project_tree_path(@project.namespace, @project, tree_join(@ref, path))
->>>>>>> ce/master
 
 %ul.blob-commit-info.hidden-xs
   - blob_commit = @repository.last_commit_for_path(@commit.id, blob.path)

app/views/projects/settings/_head.html.haml

@@ -27,21 +27,13 @@
               = link_to namespace_project_settings_ci_cd_path(@project.namespace, @project), title: 'CI/CD Pipelines' do
                 %span
                   CI/CD Pipelines
-<<<<<<< HEAD
-          = nav_link(controller: :pages) do
-            = link_to namespace_project_pages_path(@project.namespace, @project), title: 'Pages' do
-              %span
-                Pages
-
-          = nav_link(controller: :audit_events) do
-            = link_to namespace_project_audit_events_path(@project.namespace, @project), title: "Audit Events" do
-              %span
-                Audit Events
-
-=======
           - if Gitlab.config.pages.enabled
             = nav_link(controller: :pages) do
               = link_to namespace_project_pages_path(@project.namespace, @project), title: 'Pages' do
                 %span
                   Pages
->>>>>>> ce/master
+
+          = nav_link(controller: :audit_events) do
+            = link_to namespace_project_audit_events_path(@project.namespace, @project), title: "Audit Events" do
+              %span
+                Audit Events

app/views/projects/tree/_tree_header.html.haml

@@ -9,19 +9,9 @@
   %li
     = link_to namespace_project_tree_path(@project.namespace, @project, @ref) do
       = @project.path
-<<<<<<< HEAD
-  - tree_breadcrumbs(tree, 6) do |title, path, part_path|
-    %li
-      = render_lock_icon(part_path)
-      - if path
-        = link_to truncate(title, length: 40), namespace_project_tree_path(@project.namespace, @project, path)
-      - else
-        = link_to title, '#'
-=======
   - path_breadcrumbs do |title, path|
     %li
       = link_to truncate(title, length: 40), namespace_project_tree_path(@project.namespace, @project, tree_join(@ref, path))
->>>>>>> ce/master
 
 
   - if current_user

app/views/shared/notes/_note.html.haml

@@ -2,15 +2,11 @@
 - return if note.cross_reference_not_visible_for?(current_user)
 
 - note_editable = note_editable?(note)
-<<<<<<< HEAD
-%li.timeline-entry{ id: dom_id(note), class: ["note", "note-row-#{note.id}", ('system-note' if note.system)], data: {author_id: note.author.id, editable: note_editable, note_id: note.id} }
-=======
 %li.timeline-entry{ id: dom_id(note),
   class: ["note", "note-row-#{note.id}", ('system-note' if note.system)],
   data: { author_id: note.author.id,
     editable: note_editable,
     note_id: note.id } }
->>>>>>> ce/master
   .timeline-entry-inner
     .timeline-icon
       - if note.system
@@ -44,10 +40,6 @@
       .note-body{ class: note_editable ? 'js-task-list-container' : '' }
         .note-text.md
           = note.redacted_note_html
-<<<<<<< HEAD
-
-=======
->>>>>>> ce/master
         = edited_time_ago_with_tooltip(note, placement: 'bottom', html_class: 'note_edited_ago', include_author: true)
         - if note_editable
           - if note.for_personal_snippet?

db/post_migrate/20170412174900_rename_reserved_dynamic_paths.rb

@@ -41,7 +41,6 @@ class RenameReservedDynamicPaths < ActiveRecord::Migration
     labels
     milestones
     subgroups
-<<<<<<< HEAD
     analytics
     audit_events
     hooks
@@ -49,8 +48,6 @@ class RenameReservedDynamicPaths < ActiveRecord::Migration
     ldap_group_links
     notification_setting
     pipeline_quota
-=======
->>>>>>> ce/master
   ]
 
   def up

doc/api/projects.md

@@ -93,9 +93,7 @@ Parameters:
     "only_allow_merge_if_pipeline_succeeds": false,
     "only_allow_merge_if_all_discussions_are_resolved": false,
     "request_access_enabled": false,
-<<<<<<< HEAD
-    "approvals_before_merge": 0
-=======
+    "approvals_before_merge": 0,
     "statistics": {
       "commit_count": 37,
       "storage_size": 1038090,
@@ -103,7 +101,6 @@ Parameters:
       "lfs_objects_size": 0,
       "job_artifacts_size": 0
     }
->>>>>>> ce/master
   },
   {
     "id": 6,
@@ -164,9 +161,7 @@ Parameters:
     "only_allow_merge_if_pipeline_succeeds": false,
     "only_allow_merge_if_all_discussions_are_resolved": false,
     "request_access_enabled": false,
-<<<<<<< HEAD
-    "approvals_before_merge": 0
-=======
+    "approvals_before_merge": 0,
     "statistics": {
       "commit_count": 12,
       "storage_size": 2066080,
@@ -174,7 +169,6 @@ Parameters:
       "lfs_objects_size": 0,
       "job_artifacts_size": 0
     }
->>>>>>> ce/master
   }
 ]
 ```
@@ -267,9 +261,7 @@ Parameters:
   "only_allow_merge_if_pipeline_succeeds": false,
   "only_allow_merge_if_all_discussions_are_resolved": false,
   "request_access_enabled": false,
-<<<<<<< HEAD
-  "approvals_before_merge": 0
-=======
+  "approvals_before_merge": 0,
   "statistics": {
     "commit_count": 37,
     "storage_size": 1038090,
@@ -277,7 +269,6 @@ Parameters:
     "lfs_objects_size": 0,
     "job_artifacts_size": 0
   }
->>>>>>> ce/master
 }
 ```
 

doc/articles/how_to_configure_ldap_gitlab_ce/index.md

@@ -263,8 +263,4 @@ have extended functionalities with LDAP, such as:
 - Updating user permissions
 - Multiple LDAP servers
 
-<<<<<<< HEAD
 Read through the article on [LDAP for GitLab EE](../how_to_configure_ldap_gitlab_ee/index.md) for an overview.
-=======
-Read through the article on [LDAP for GitLab EE](https://docs.gitlab.com/ee/articles/how_to_configure_ldap_gitlab_ee/) for an overview.
->>>>>>> ce/master

doc/articles/index.md

@@ -11,10 +11,7 @@ They are written by members of the GitLab Team and by
 
 - **LDAP**
   - [How to configure LDAP with GitLab CE](how_to_configure_ldap_gitlab_ce/index.md)
-<<<<<<< HEAD
   - [How to configure LDAP with GitLab EE](how_to_configure_ldap_gitlab_ee/index.md)
-=======
->>>>>>> ce/master
 
 ## GitLab Pages
 

doc/topics/authentication/index.md

@@ -19,11 +19,7 @@ This page gathers all the resources for the topic **Authentication** within GitL
 - [Enforce Two-factor Authentication (2FA)](../../security/two_factor_authentication.md#enforce-two-factor-authentication-2fa)
 - **Articles:**
   - [How to Configure LDAP with GitLab CE](../../articles/how_to_configure_ldap_gitlab_ce/index.md)
-<<<<<<< HEAD
   - [How to Configure LDAP with GitLab EE](../../articles/how_to_configure_ldap_gitlab_ee/index.md)
-=======
-  - [How to Configure LDAP with GitLab EE](https://docs.gitlab.com/articles/how_to_configure_ldap_gitlab_ee/)
->>>>>>> ce/master
   - [Feature Highlight: LDAP Integration](https://about.gitlab.com/2014/07/10/feature-highlight-ldap-sync/)
   - [Debugging LDAP](https://about.gitlab.com/handbook/support/workflows/ldap/debugging_ldap.html)
 - **Integrations:**

features/support/env.rb

@@ -10,11 +10,12 @@ if ENV['CI']
   Knapsack::Adapters::SpinachAdapter.bind
 end
 
-<<<<<<< HEAD
-%w(select2_helper test_env repo_helpers license wait_for_ajax sidekiq).each do |f|
-=======
 %w(select2_helper test_env repo_helpers wait_for_ajax wait_for_requests sidekiq).each do |f|
->>>>>>> ce/master
+  require Rails.root.join('spec', 'support', f)
+end
+
+# EE-only
+%w(license).each do |f|
   require Rails.root.join('spec', 'support', f)
 end
 

lib/gitlab/import_export/import_export.yml

@@ -85,13 +85,10 @@ excluded_attributes:
     - :id
     - :star_count
     - :last_activity_at
-<<<<<<< HEAD
     - :mirror_last_update_at
     - :mirror_last_successful_update_at
     - :mirror_user_id
     - :mirror_trigger_builds
-=======
->>>>>>> ce/master
   snippets:
     - :expired_at
   merge_request_diff:
@@ -121,4 +118,4 @@ methods:
   merge_requests:
     - :diff_head_sha
   project:
-    - :description_html
\ No newline at end of file
+    - :description_html

spec/features/merge_requests/create_new_mr_spec.rb

@@ -34,10 +34,6 @@ feature 'Create New Merge Request', feature: true, js: true do
     expect(page).to have_content('Target branch')
 
     first('.js-target-branch').click
-<<<<<<< HEAD
-    first('.dropdown-target-branch .dropdown-content')
-=======
->>>>>>> ce/master
     find('.dropdown-target-branch .dropdown-content a', text: 'v1.1.0', match: :first).click
 
     expect(page).to have_content "b83d6e3"

spec/finders/issues_finder_spec.rb

@@ -309,7 +309,6 @@ describe IssuesFinder do
 
     it 'returns all issues for user authorized for the issues projects' do
       expect(described_class.send(:not_restricted_by_confidentiality, authorized_user)).to include(public_issue, confidential_issue)
-<<<<<<< HEAD
     end
 
     it 'returns all issues for an admin user' do
@@ -318,8 +317,6 @@ describe IssuesFinder do
 
     it 'returns all issues for an auditor user' do
       expect(described_class.send(:not_restricted_by_confidentiality, auditor_user)).to include(public_issue, confidential_issue)
-=======
->>>>>>> ce/master
     end
   end
 end

spec/finders/merge_requests_finder_spec.rb

@@ -30,15 +30,12 @@ describe MergeRequestsFinder do
     it 'filters by project' do
       params = { project_id: project1.id, scope: 'authored', state: 'opened' }
       merge_requests = described_class.new(user, params).execute
-<<<<<<< HEAD
       expect(merge_requests.size).to eq(1)
     end
 
     it 'ignores sorting by weight' do
       params = { project_id: project1.id, scope: 'authored', state: 'opened', weight: Issue::WEIGHT_ANY }
       merge_requests = described_class.new(user, params).execute
-=======
->>>>>>> ce/master
       expect(merge_requests.size).to eq(1)
     end
 

spec/finders/snippets_finder_spec.rb

@@ -15,20 +15,12 @@ describe SnippetsFinder do
 
     it "returns all private and internal snippets" do
       snippets = described_class.new.execute(user, filter: :all)
-<<<<<<< HEAD
-
-=======
->>>>>>> ce/master
       expect(snippets).to include(snippet2, snippet3)
       expect(snippets).not_to include(snippet1)
     end
 
     it "returns all public snippets" do
       snippets = described_class.new.execute(nil, filter: :all)
-<<<<<<< HEAD
-
-=======
->>>>>>> ce/master
       expect(snippets).to include(snippet3)
       expect(snippets).not_to include(snippet1, snippet2)
     end
@@ -54,10 +46,6 @@ describe SnippetsFinder do
 
     it "returns all public and internal snippets" do
       snippets = described_class.new.execute(user1, filter: :by_user, user: user)
-<<<<<<< HEAD
-
-=======
->>>>>>> ce/master
       expect(snippets).to include(snippet2, snippet3)
       expect(snippets).not_to include(snippet1)
     end
@@ -70,39 +58,23 @@ describe SnippetsFinder do
 
     it "returns private snippets" do
       snippets = described_class.new.execute(user, filter: :by_user, user: user, scope: "are_private")
-<<<<<<< HEAD
-
-=======
->>>>>>> ce/master
       expect(snippets).to include(snippet1)
       expect(snippets).not_to include(snippet2, snippet3)
     end
 
     it "returns public snippets" do
       snippets = described_class.new.execute(user, filter: :by_user, user: user, scope: "are_public")
-<<<<<<< HEAD
-
-=======
->>>>>>> ce/master
       expect(snippets).to include(snippet3)
       expect(snippets).not_to include(snippet1, snippet2)
     end
 
     it "returns all snippets" do
       snippets = described_class.new.execute(user, filter: :by_user, user: user)
-<<<<<<< HEAD
-
-=======
->>>>>>> ce/master
       expect(snippets).to include(snippet1, snippet2, snippet3)
     end
 
     it "returns only public snippets if unauthenticated user" do
       snippets = described_class.new.execute(nil, filter: :by_user, user: user)
-<<<<<<< HEAD
-
-=======
->>>>>>> ce/master
       expect(snippets).to include(snippet3)
       expect(snippets).not_to include(snippet2, snippet1)
     end
@@ -117,74 +89,42 @@ describe SnippetsFinder do
 
     it "returns public snippets for unauthorized user" do
       snippets = described_class.new.execute(nil, filter: :by_project, project: project1)
-<<<<<<< HEAD
-
-=======
->>>>>>> ce/master
       expect(snippets).to include(@snippet3)
       expect(snippets).not_to include(@snippet1, @snippet2)
     end
 
     it "returns public and internal snippets for non project members" do
       snippets = described_class.new.execute(user, filter: :by_project, project: project1)
-<<<<<<< HEAD
-
-=======
->>>>>>> ce/master
       expect(snippets).to include(@snippet2, @snippet3)
       expect(snippets).not_to include(@snippet1)
     end
 
     it "returns public snippets for non project members" do
       snippets = described_class.new.execute(user, filter: :by_project, project: project1, scope: "are_public")
-<<<<<<< HEAD
-
-=======
->>>>>>> ce/master
       expect(snippets).to include(@snippet3)
       expect(snippets).not_to include(@snippet1, @snippet2)
     end
 
     it "returns internal snippets for non project members" do
       snippets = described_class.new.execute(user, filter: :by_project, project: project1, scope: "are_internal")
-<<<<<<< HEAD
-
-=======
->>>>>>> ce/master
       expect(snippets).to include(@snippet2)
       expect(snippets).not_to include(@snippet1, @snippet3)
     end
 
     it "does not return private snippets for non project members" do
       snippets = described_class.new.execute(user, filter: :by_project, project: project1, scope: "are_private")
-<<<<<<< HEAD
-
-=======
->>>>>>> ce/master
       expect(snippets).not_to include(@snippet1, @snippet2, @snippet3)
     end
 
     it "returns all snippets for project members" do
       project1.team << [user, :developer]
-<<<<<<< HEAD
-
       snippets = described_class.new.execute(user, filter: :by_project, project: project1)
-
-=======
-      snippets = described_class.new.execute(user, filter: :by_project, project: project1)
->>>>>>> ce/master
       expect(snippets).to include(@snippet1, @snippet2, @snippet3)
     end
 
     it "returns private snippets for project members" do
       project1.team << [user, :developer]
-<<<<<<< HEAD
-
-      snippets = described_class.new.execute(user, filter: :by_project, project: project1, scope: "are_private")
-
-=======
       snippets = described_class.new.execute(user, filter: :by_project, project: project1, scope: "are_private")
->>>>>>> ce/master
       expect(snippets).to include(@snippet1)
     end
 

spec/lib/gitlab/import_export/safe_model_attributes.yml

@@ -355,7 +355,6 @@ Project:
 - auto_cancel_pending_pipelines
 - printing_merge_request_link_enabled
 - build_allow_git_fetch
-<<<<<<< HEAD
 - merge_requests_template
 - merge_requests_rebase_enabled
 - approvals_before_merge
@@ -365,8 +364,6 @@ Project:
 - repository_size_limit
 - sync_time
 - service_desk_enabled
-=======
->>>>>>> ce/master
 Author:
 - name
 ProjectFeature:

spec/mailers/notify_spec.rb

@@ -235,16 +235,7 @@ describe Notify do
         end
 
         describe 'that are new with a description' do
-<<<<<<< HEAD
-          subject do
-            described_class.new_merge_request_email(
-              merge_request_with_description.assignee_id,
-              merge_request_with_description.id
-            )
-          end
-=======
           subject { described_class.new_merge_request_email(merge_request_with_description.assignee_id, merge_request_with_description.id) }
->>>>>>> ce/master
 
           it_behaves_like 'it should show Gmail Actions View Merge request link'
           it_behaves_like "an unsubscribeable thread"

spec/workers/post_receive_spec.rb

@@ -76,7 +76,6 @@ describe PostReceive do
     it "fetches the correct project" do
       expect(Project).to receive(:find_by_full_path).with(project.path_with_namespace).and_return(project)
       described_class.new.perform(pwd(project), key_id, base64_changes)
-<<<<<<< HEAD
     end
 
     it "triggers wiki index update" do
@@ -88,8 +87,6 @@ describe PostReceive do
       repo_path = "#{pwd(project)}.wiki"
 
       described_class.new.perform(repo_path, key_id, base64_changes)
-=======
->>>>>>> ce/master
     end
 
     it "does not run if the author is not in the project" do