Resolve conflicts

config/README.md

@@ -19,11 +19,7 @@ an ERB file and then loads the resulting YML as its configuration.
 
 This file is called `resque.yml` for historical reasons. We are **NOT**
 using Resque at the moment. It is used to specify Redis configuration
-<<<<<<< HEAD
-values instead when a single database instance of Redis is desired.
-=======
 values when a single database instance of Redis is desired.
->>>>>>> ce-com/master
 
 # Advanced Redis configuration files
 

config/initializers/sidekiq.rb

@@ -78,9 +78,5 @@ begin
       end
     end
   end
-<<<<<<< HEAD
-rescue ::Redis::BaseError, SocketError, Errno::ENOENT, Errno::EAFNOSUPPORT, Errno::ECONNRESET, Errno::ECONNREFUSED
-=======
 rescue Redis::BaseError, SocketError, Errno::ENOENT, Errno::EADDRNOTAVAIL, Errno::EAFNOSUPPORT, Errno::ECONNRESET, Errno::ECONNREFUSED
->>>>>>> ce-com/master
 end

lib/gitlab/lfs_token.rb

@@ -20,18 +20,8 @@ module Gitlab
     def token
       Gitlab::Redis::SharedState.with do |redis|
         token = redis.get(redis_shared_state_key)
-<<<<<<< HEAD
-
-        if token
-          redis.expire(redis_shared_state_key, EXPIRY_TIME)
-        else
-          token = Devise.friendly_token(TOKEN_LENGTH)
-          redis.set(redis_shared_state_key, token, ex: EXPIRY_TIME)
-        end
-=======
         token ||= Devise.friendly_token(TOKEN_LENGTH)
         redis.set(redis_shared_state_key, token, ex: EXPIRY_TIME)
->>>>>>> ce-com/master
 
         token
       end

scripts/prepare_build.sh

@@ -8,14 +8,9 @@ if [ "$USE_BUNDLE_INSTALL" != "false" ]; then
     bundle install --clean $BUNDLE_INSTALL_FLAGS && bundle check
 fi
 
-# Only install fog-aws/mime-types after bundle install! Otherwise oddly some native
+# Only install knapsack after bundle install! Otherwise oddly some native
 # gems could not be found under some circumstance. No idea why, hours wasted.
-<<<<<<< HEAD
 retry gem install knapsack fog-aws mime-types
-=======
-# TODO: remove workaround on !10156
-retry gem install fog-aws mime-types
->>>>>>> ce-com/master
 
 cp config/gitlab.yml.example config/gitlab.yml
 
@@ -50,12 +45,9 @@ else # Assume it's mysql
     sed -i 's/# host:.*/host: mysql/g' config/database_geo.yml
 fi
 
-<<<<<<< HEAD
-=======
 cp config/resque.yml.example config/resque.yml
 sed -i 's/localhost/redis/g' config/resque.yml
 
->>>>>>> ce-com/master
 cp config/redis.cache.yml.example config/redis.cache.yml
 sed -i 's/localhost/redis/g' config/redis.cache.yml
 

spec/lib/gitlab/current_settings_spec.rb

@@ -26,13 +26,9 @@ describe Gitlab::CurrentSettings do
         expect(current_application_settings).to be_a(ApplicationSetting)
       end
 
-<<<<<<< HEAD
       it 'falls back to DB if Caching fails' do
-=======
-      it 'falls back to DB if Redis fails' do
         db_settings = ApplicationSetting.create!(ApplicationSetting.defaults)
 
->>>>>>> ce-com/master
         expect(ApplicationSetting).to receive(:cached).and_raise(::Redis::BaseError)
         expect(Rails.cache).to receive(:fetch).with(ApplicationSetting::CACHE_KEY).and_raise(Redis::BaseError)
 

spec/requests/api/internal_spec.rb

@@ -168,7 +168,6 @@ describe API::Internal do
     end
   end
 
-<<<<<<< HEAD
   describe "GET /internal/authorized_keys" do
     context "unsing an existing key's fingerprint" do
       it "finds the key" do
@@ -217,8 +216,6 @@ describe API::Internal do
     end
   end
 
-=======
->>>>>>> ce-com/master
   describe "POST /internal/allowed", :clean_gitlab_redis_shared_state do
     context "access granted" do
       before do