Fix merge conflicts

app/assets/javascripts/issuable_form.js

@@ -3,12 +3,9 @@
 /* global UsersSelect */
 /* global ZenMode */
 /* global Autosave */
-<<<<<<< HEAD
 /* global GroupsSelect */
-=======
 /* global dateFormat */
 /* global Pikaday */
->>>>>>> ce/master
 
 (function() {
   var bind = function(fn, me) { return function() { return fn.apply(me, arguments); }; };

app/controllers/admin/dashboard_controller.rb

@@ -2,11 +2,7 @@ class Admin::DashboardController < Admin::ApplicationController
   def index
     @projects = Project.with_route.limit(10)
     @users = User.limit(10)
-<<<<<<< HEAD
-    @groups = Group.limit(10)
-    @license = License.current
-=======
     @groups = Group.with_route.limit(10)
->>>>>>> ce/master
+    @license = License.current
   end
 end

app/models/namespace.rb

@@ -178,21 +178,10 @@ class Namespace < ActiveRecord::Base
     Gitlab.config.lfs.enabled
   end
 
-<<<<<<< HEAD
   def actual_size_limit
     current_application_settings.repository_size_limit
   end
 
-  def full_path
-    if parent
-      parent.full_path + '/' + path
-    else
-      path
-    end
-  end
-
-=======
->>>>>>> ce/master
   def shared_runners_enabled?
     projects.with_shared_runners.any?
   end

app/models/project.rb

@@ -1594,10 +1594,6 @@ class Project < ActiveRecord::Base
       current_application_settings.default_branch_protection == Gitlab::Access::PROTECTION_DEV_CAN_MERGE
   end
 
-<<<<<<< HEAD
-  def full_path_changed?
-    path_changed? || namespace_id_changed?
-=======
   # Similar to the normal callbacks that hook into the life cycle of an
   # Active Record object, you can also define callbacks that get triggered
   # when you add an object to an association collection. If any of these
@@ -1607,7 +1603,6 @@ class Project < ActiveRecord::Base
   # than the number of permitted boards per project it won't fail.
   def validate_board_limit(board)
     raise BoardLimitExceeded, 'Number of permitted boards exceeded' if boards.size >= NUMBER_OF_PERMITTED_BOARDS
->>>>>>> ce/master
   end
 
   def update_project_statistics

lib/api/projects.rb

@@ -24,13 +24,10 @@ module API
         optional :request_access_enabled, type: Boolean, desc: 'Allow users to request member access'
         optional :only_allow_merge_if_build_succeeds, type: Boolean, desc: 'Only allow to merge if builds succeed'
         optional :only_allow_merge_if_all_discussions_are_resolved, type: Boolean, desc: 'Only allow to merge if all discussions are resolved'
-<<<<<<< HEAD
 
         # EE-specific
         optional :repository_storage, type: String, desc: 'Which storage shard the repository is on. Available only to admins'
         optional :approvals_before_merge, type: Integer, desc: 'How many approvers should approve merge request by default'
-=======
->>>>>>> ce/master
       end
     end