Resolve coflicts in app/ except js after merge from CE

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

app/assets/javascripts/commons/jquery.js

@@ -9,9 +9,6 @@ import 'vendor/jquery.scrollTo';
 import 'vendor/jquery.nicescroll';
 import 'vendor/jquery.waitforimages';
 import 'select2/select2';
-<<<<<<< HEAD
 
 // EE-only
 import 'vendor/jquery.tablesorter';
-=======
->>>>>>> ce-com/master

app/models/project.rb

@@ -114,11 +114,8 @@ class Project < ActiveRecord::Base
   has_one :gitlab_issue_tracker_service, dependent: :destroy, inverse_of: :project
   has_one :external_wiki_service, dependent: :destroy
   has_one :kubernetes_service, dependent: :destroy, inverse_of: :project
-<<<<<<< HEAD
   has_one :index_status, dependent: :destroy
-=======
   has_one :mock_ci_service, dependent: :destroy
->>>>>>> ce-com/master
 
   has_one  :forked_project_link,  dependent: :destroy, foreign_key: "forked_to_project_id"
   has_one  :forked_from_project,  through:   :forked_project_link

app/policies/group_policy.rb

@@ -45,7 +45,6 @@ class GroupPolicy < BasePolicy
 
     GroupProjectsFinder.new(@subject).execute(@user).any?
   end
-<<<<<<< HEAD
 
   def additional_rules!(master)
     if @subject.ldap_synced?
@@ -53,6 +52,4 @@ class GroupPolicy < BasePolicy
       can! :override_group_member if master
     end
   end
-=======
->>>>>>> ce-com/master
 end

app/views/layouts/nav/_project.html.haml

@@ -27,11 +27,7 @@
           Project
 
     - if project_nav_tab? :files
-<<<<<<< HEAD
-      = nav_link(controller: %w(tree blob blame edit_tree new_tree find_file commit commits compare repositories tags branches releases network path_locks)) do
-=======
-      = nav_link(controller: %w(tree blob blame edit_tree new_tree find_file commit commits compare repositories tags branches releases graphs network)) do
->>>>>>> ce-com/master
+      = nav_link(controller: %w(tree blob blame edit_tree new_tree find_file commit commits compare repositories tags branches releases graphs network path_locks)) do
         = link_to project_files_path(@project), title: 'Repository',  class: 'shortcuts-tree' do
           %span
             Repository

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

@@ -19,12 +19,6 @@
           = link_to namespace_project_tags_path(@project.namespace, @project) do
             Tags
 
-<<<<<<< HEAD
-        - if license_allows_file_locks?
-          = nav_link(controller: [:path_locks]) do
-            = link_to namespace_project_path_locks_path(@project.namespace, @project) do
-              Locked Files
-=======
         = nav_link(path: 'graphs#show') do
           = link_to namespace_project_graph_path(@project.namespace, @project, current_ref) do
             Contributors
@@ -40,4 +34,8 @@
         = nav_link(path: 'graphs#charts') do
           = link_to charts_namespace_project_graph_path(@project.namespace, @project, current_ref) do
             Charts
->>>>>>> ce-com/master
+
+        - if license_allows_file_locks?
+          = nav_link(controller: [:path_locks]) do
+            = link_to namespace_project_path_locks_path(@project.namespace, @project) do
+              Locked Files

app/views/projects/merge_requests/widget/open/_accept.html.haml

@@ -9,17 +9,10 @@
       .accept-action
         - if @pipeline && @pipeline.active?
           %span.btn-group
-<<<<<<< HEAD
             = button_tag class: "btn btn-info js-merge-when-pipeline-succeeds-button merge-when-pipeline-succeeds", disabled: !@merge_request.approved?, ":disabled" => "disableAcceptance" do
               Merge When Pipeline Succeeds
             - unless @project.only_allow_merge_if_pipeline_succeeds?
               = button_tag class: "btn btn-info dropdown-toggle", 'data-toggle' => 'dropdown', disabled: !@merge_request.approved?, ":disabled" => "disableAcceptance" do
-=======
-            = button_tag class: "btn btn-info js-merge-when-pipeline-succeeds-button merge-when-pipeline-succeeds" do
-              Merge When Pipeline Succeeds
-            - unless @project.only_allow_merge_if_pipeline_succeeds?
-              = button_tag class: "btn btn-info dropdown-toggle", 'data-toggle' => 'dropdown' do
->>>>>>> ce-com/master
                 = icon('caret-down')
                 %span.sr-only
                   Select Merge Moment
@@ -33,11 +26,7 @@
                     = icon('warning fw')
                     Merge Immediately
         - else
-<<<<<<< HEAD
           = f.button class: "btn btn-grouped js-merge-button accept-merge-request", disabled: !@merge_request.approved?, ":disabled" => "disableAcceptance" do
-=======
-          = f.button class: "btn btn-grouped js-merge-button accept-merge-request" do
->>>>>>> ce-com/master
             Accept Merge Request
       - if @merge_request.force_remove_source_branch?
         .accept-control