Resolve conflicts in lib/ after merge from CE

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

lib/api/api.rb

@@ -21,14 +21,10 @@ module API
       mount ::API::V3::MergeRequestDiffs
       mount ::API::V3::MergeRequests
       mount ::API::V3::Notes
-<<<<<<< HEAD
       mount ::API::V3::ProjectGitHook
-      mount ::API::V3::ProjectHooks
       mount ::API::V3::ProjectPushRule
-=======
       mount ::API::V3::Pipelines
       mount ::API::V3::ProjectHooks
->>>>>>> ce-com/master
       mount ::API::V3::Milestones
       mount ::API::V3::Projects
       mount ::API::V3::ProjectSnippets

lib/api/entities.rb

@@ -150,15 +150,14 @@ module API
 
     class Group < Grape::Entity
       expose :id, :name, :path, :description, :visibility
-<<<<<<< HEAD
 
+      ## EE-only
       expose :ldap_cn, :ldap_access
       expose :ldap_group_links,
         using: Entities::LdapGroupLink,
         if: lambda { |group, options| group.ldap_group_links.any? }
+      ## EE-only
 
-=======
->>>>>>> ce-com/master
       expose :lfs_enabled?, as: :lfs_enabled
       expose :avatar_url
       expose :web_url

lib/api/v3/entities.rb

@@ -167,15 +167,14 @@ module API
 
       class Group < Grape::Entity
         expose :id, :name, :path, :description, :visibility_level
-<<<<<<< HEAD
 
+        # EE-only
         expose :ldap_cn, :ldap_access
         expose :ldap_group_links,
                using: ::API::Entities::LdapGroupLink,
                if: lambda { |group, options| group.ldap_group_links.any? }
+        # EE-only
 
-=======
->>>>>>> ce-com/master
         expose :lfs_enabled?, as: :lfs_enabled
         expose :avatar_url
         expose :web_url

lib/api/v3/groups.rb

@@ -11,7 +11,6 @@ module API
           optional :visibility_level, type: Integer, desc: 'The visibility level of the group'
           optional :lfs_enabled, type: Boolean, desc: 'Enable/disable LFS for the projects in this group'
           optional :request_access_enabled, type: Boolean, desc: 'Allow users to request member access'
-<<<<<<< HEAD
           optional :membership_lock, type: Boolean, desc: 'Prevent adding new members to project membership within this group'
           optional :share_with_group_lock, type: Boolean, desc: 'Prevent sharing a project with another group within this group'
         end
@@ -20,8 +19,6 @@ module API
           optional :ldap_cn, type: String, desc: 'LDAP Common Name'
           optional :ldap_access, type: Integer, desc: 'A valid access level'
           all_or_none_of :ldap_cn, :ldap_access
-=======
->>>>>>> ce-com/master
         end
 
         params :statistics_params do
@@ -87,15 +84,11 @@ module API
           requires :path, type: String, desc: 'The path of the group'
           optional :parent_id, type: Integer, desc: 'The parent group id for creating nested group'
           use :optional_params
-<<<<<<< HEAD
           use :optional_params_ee
-=======
->>>>>>> ce-com/master
         end
         post do
           authorize! :create_group
 
-<<<<<<< HEAD
           ldap_link_attrs = {
             cn: params.delete(:ldap_cn),
             group_access: params.delete(:ldap_access)
@@ -112,11 +105,6 @@ module API
               )
             end
 
-=======
-          group = ::Groups::CreateService.new(current_user, declared_params(include_missing: false)).execute
-
-          if group.persisted?
->>>>>>> ce-com/master
             present group, with: Entities::Group, current_user: current_user
           else
             render_api_error!("Failed to save group #{group.errors.messages}", 400)

lib/api/v3/settings.rb

@@ -110,7 +110,6 @@ module API
           requires :housekeeping_gc_period, type: Integer, desc: "Number of Git pushes after which 'git gc' is run."
         end
         optional :terminal_max_session_time, type: Integer, desc: 'Maximum time for web terminal websocket connection (in seconds). Set to 0 for unlimited time.'
-<<<<<<< HEAD
         # GitLab-EE specific settings
         optional :help_text, type: String, desc: 'GitLab server administrator information'
         optional :elasticsearch_indexing, type: Boolean, desc: 'Enable Elasticsearch indexing'
@@ -122,8 +121,6 @@ module API
         optional :repository_storage, type: String, desc: 'The first entry in `repository_storages`. Deprecated, but retained for compatibility reasons'
         optional :repository_storages, type: Array[String], desc: 'A list of names of enabled storage paths, taken from `gitlab.yml`. New projects will be created in one of these stores, chosen at random.'
         optional :repository_size_limit, type: Integer, desc: 'Size limit per repository (MB)'
-=======
->>>>>>> ce-com/master
         at_least_one_of :default_branch_protection, :default_project_visibility, :default_snippet_visibility,
                         :default_group_visibility, :restricted_visibility_levels, :import_sources,
                         :enabled_git_access_protocol, :gravatar_enabled, :default_projects_limit,
@@ -135,17 +132,11 @@ module API
                         :shared_runners_enabled, :max_artifacts_size, :max_pages_size, :container_registry_token_expire_delay,
                         :metrics_enabled, :sidekiq_throttling_enabled, :recaptcha_enabled,
                         :akismet_enabled, :admin_notification_email, :sentry_enabled,
-<<<<<<< HEAD
                         :repository_checks_enabled, :koding_enabled, :housekeeping_enabled, :terminal_max_session_time, :plantuml_enabled,
                         :version_check_enabled, :email_author_in_body, :html_emails_enabled,
                         # GitLab-EE specific settings
                         :help_text, :elasticsearch_indexing, :usage_ping_enabled,
                         :repository_storage, :repository_storages, :repository_size_limit
-=======
-                        :repository_storage, :repository_checks_enabled, :koding_enabled, :plantuml_enabled,
-                        :version_check_enabled, :email_author_in_body, :html_emails_enabled,
-                        :housekeeping_enabled, :terminal_max_session_time
->>>>>>> ce-com/master
       end
       put "application/settings" do
         if current_settings.update_attributes(declared_params(include_missing: false))