Resolve conflcits after daily CE to EE merge

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

app/controllers/search_controller.rb

@@ -15,39 +15,10 @@ class SearchController < ApplicationController
 
     @search_term = params[:search]
 
-<<<<<<< HEAD
-    @scope = params[:scope]
-    @show_snippets = params[:snippets].eql? 'true'
-
-    @search_results =
-      if @project
-        unless %w(blobs notes issues merge_requests milestones wiki_blobs
-                  commits).include?(@scope)
-          @scope = 'blobs'
-        end
-
-        Search::ProjectService.new(@project, current_user, params).execute
-      elsif @show_snippets
-        unless %w(snippet_blobs snippet_titles).include?(@scope)
-          @scope = 'snippet_blobs'
-        end
-
-        Search::SnippetService.new(current_user, params).execute
-      else
-        unless %w(projects issues merge_requests milestones blobs commits).include?(@scope)
-          @scope = 'projects'
-        end
-
-        Search::GlobalService.new(current_user, params).execute
-      end
-
-    @search_objects = @search_results.objects(@scope, params[:page])
-=======
     @scope = search_service.scope
     @show_snippets = search_service.show_snippets?
     @search_results = search_service.search_results
     @search_objects = search_service.search_objects
->>>>>>> ce-com/master
 
     check_single_commit_result
   end

app/controllers/sessions_controller.rb

@@ -79,16 +79,7 @@ class SessionsController < Devise::SessionsController
   def store_redirect_path
     redirect_uri =
       if request.referer.present? && (params['redirect_to_referer'] == 'yes')
-<<<<<<< HEAD
         URI(request.referer)
-=======
-        referer_uri = URI(request.referer)
-        if referer_uri.host == Gitlab.config.gitlab.host
-          referer_uri.request_uri
-        else
-          request.fullpath
-        end
->>>>>>> ce-com/master
       else
         URI(request.url)
       end

app/models/application_setting.rb

@@ -148,13 +148,10 @@ class ApplicationSetting < ActiveRecord::Base
             presence: true,
             numericality: { greater_than_or_equal_to: 0 }
 
-<<<<<<< HEAD
   validates :minimum_mirror_sync_time,
             presence: true,
             inclusion: { in: Gitlab::Mirror::SYNC_TIME_OPTIONS.values }
 
-=======
->>>>>>> ce-com/master
   validates_each :restricted_visibility_levels do |record, attr, value|
     value&.each do |level|
       unless Gitlab::VisibilityLevel.options.has_value?(level)
@@ -261,7 +258,6 @@ class ApplicationSetting < ActiveRecord::Base
       two_factor_grace_period: 48,
       user_default_external: false,
       polling_interval_multiplier: 1
-<<<<<<< HEAD
     }
   end
 
@@ -273,8 +269,6 @@ class ApplicationSetting < ActiveRecord::Base
       usage_ping_enabled: true,
       minimum_mirror_sync_time: Gitlab::Mirror::FIFTEEN,
       repository_size_limit: 0
-=======
->>>>>>> ce-com/master
     }
   end
 

app/views/admin/application_settings/_form.html.haml

@@ -656,7 +656,6 @@
           The default value (1) is a reasonable choice for the majority of GitLab
           installations. Set to 0 to completely disable polling.
 
-<<<<<<< HEAD
   - if Gitlab::Geo.license_allows?
     %fieldset
       %legend GitLab Geo
@@ -670,7 +669,5 @@
             The amount of seconds after which a request to get a secondary node
             status will time out.
 
-=======
->>>>>>> ce-com/master
   .form-actions
     = f.submit 'Save', class: 'btn btn-save'

app/views/layouts/header/_default.html.haml

@@ -59,11 +59,6 @@
                 = icon('check-circle fw')
                 %span.badge.todos-count
                   = todos_count_format(todos_pending_count)
-<<<<<<< HEAD
-            - if current_user.can_create_project?
-              %li
-                = link_to new_project_path, title: 'New project', aria: { label: "New project" }, data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do
-                  = icon('plus fw')
 
             - if Gitlab::Geo.secondary?
               %li
@@ -75,8 +70,7 @@
                 = link_to sherlock_transactions_path, title: 'Sherlock Transactions',
                   data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do
                   = icon('tachometer fw')
-=======
->>>>>>> ce-com/master
+
             %li.header-user.dropdown
               = link_to current_user, class: "header-user-dropdown-toggle", data: { toggle: "dropdown" } do
                 = image_tag avatar_icon(current_user, 26), width: 26, height: 26, class: "header-user-avatar"

db/schema.rb

@@ -118,11 +118,9 @@ ActiveRecord::Schema.define(version: 20170329124448) do
     t.integer "shared_runners_minutes", default: 0, null: false
     t.integer "repository_size_limit", limit: 8, default: 0
     t.integer "terminal_max_session_time", default: 0, null: false
-    t.decimal "polling_interval_multiplier", default: 1.0, null: false
     t.integer "unique_ips_limit_per_user"
     t.integer "unique_ips_limit_time_window"
     t.boolean "unique_ips_limit_enabled", default: false, null: false
-<<<<<<< HEAD
     t.integer "minimum_mirror_sync_time", default: 15, null: false
     t.string "default_artifacts_expire_in", default: "0", null: false
     t.string "elasticsearch_url", default: "http://localhost:9200"
@@ -132,6 +130,7 @@ ActiveRecord::Schema.define(version: 20170329124448) do
     t.string "elasticsearch_aws_secret_access_key"
     t.integer "geo_status_timeout", default: 10
     t.string "uuid"
+    t.decimal "polling_interval_multiplier", default: 1.0, null: false
   end
 
   create_table "approvals", force: :cascade do |t|
@@ -158,9 +157,6 @@ ActiveRecord::Schema.define(version: 20170329124448) do
     t.integer "user_id", null: false
     t.datetime "created_at"
     t.datetime "updated_at"
-=======
-    t.decimal "polling_interval_multiplier", default: 1.0, null: false
->>>>>>> ce-com/master
   end
 
   add_index "approvers", ["target_id", "target_type"], name: "index_approvers_on_target_id_and_target_type", using: :btree

lib/api/settings.rb

@@ -109,7 +109,7 @@ module API
         requires :housekeeping_full_repack_period, type: Integer, desc: "Number of Git pushes after which a full 'git repack' is run."
         requires :housekeeping_gc_period, type: Integer, desc: "Number of Git pushes after which 'git gc' is run."
       end
-<<<<<<< HEAD
+      optional :terminal_max_session_time, type: Integer, desc: 'Maximum time for web terminal websocket connection (in seconds). Set to 0 for unlimited time.'
       optional :polling_interval_multiplier, type: BigDecimal, desc: 'Interval multiplier used by endpoints that perform polling. Set to 0 to disable polling.'
       # GitLab-EE specific settings
       optional :help_text, type: String, desc: 'GitLab server administrator information'
@@ -127,10 +127,6 @@ module API
       optional :usage_ping_enabled, type: Boolean, desc: 'Every week GitLab will report license usage back to GitLab, Inc.'
       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)'
-=======
-      optional :terminal_max_session_time, type: Integer, desc: 'Maximum time for web terminal websocket connection (in seconds). Set to 0 for unlimited time.'
-      optional :polling_interval_multiplier, type: BigDecimal, desc: 'Interval multiplier used by endpoints that perform polling. Set to 0 to disable polling.'
->>>>>>> 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,
@@ -144,16 +140,12 @@ module API
                       :container_registry_token_expire_delay,
                       :metrics_enabled, :sidekiq_throttling_enabled, :recaptcha_enabled,
                       :akismet_enabled, :admin_notification_email, :sentry_enabled,
-                      :repository_checks_enabled, :koding_enabled, :housekeeping_enabled, :terminal_max_session_time, :plantuml_enabled,
+                      :repository_checks_enabled, :koding_enabled, :plantuml_enabled,
                       :version_check_enabled, :email_author_in_body, :html_emails_enabled,
-<<<<<<< HEAD
-                      :polling_interval_multiplier,
+                      :housekeeping_enabled, :terminal_max_session_time, :polling_interval_multiplier,
                       # GitLab-EE specific settings
                       :help_text, :elasticsearch_indexing, :usage_ping_enabled,
                       :repository_storages, :repository_size_limit
-=======
-                      :housekeeping_enabled, :terminal_max_session_time, :polling_interval_multiplier
->>>>>>> ce-com/master
     end
     put "application/settings" do
       attrs = declared_params(include_missing: false)