Resolve easy conflicts

Signed-off-by: Rémy Coutable <remy@rymai.me>

.gitlab-ci.yml

@@ -54,10 +54,7 @@ stages:
   services:
     - postgres:latest
     - redis:alpine
-<<<<<<< HEAD
     - elasticsearch:5.1
-=======
->>>>>>> upstream/master
 
 .use-mysql: &use-mysql
   services:

CHANGELOG.md

@@ -11,10 +11,7 @@ entry.
 - Fix lastest commit status text on main project page. !10863
 - Add index on ci_builds.updated_at. !10870 (blackst0ne)
 - Fix 500 error due to trying to show issues from pending deleting projects. !10906
-<<<<<<< HEAD
-=======
 - Ensures that OAuth/LDAP/SAML users don't need to be confirmed.
->>>>>>> upstream/master
 - Ensure replying to an individual note by email creates a note with its own discussion ID.
 - Fix OAuth, LDAP and SAML SSO when regular sign-ups are disabled.
 - Fix usage ping docs link from empty cohorts page.

Gemfile.lock

@@ -216,16 +216,11 @@ GEM
       railties (>= 3.0.0)
     faraday (0.11.0)
       multipart-post (>= 1.2, < 3)
-<<<<<<< HEAD
-    faraday_middleware (0.10.0)
-      faraday (>= 0.7.4, < 0.10)
+    faraday_middleware (0.11.0.1)
+      faraday (>= 0.7.4, < 1.0)
     faraday_middleware-aws-signers-v4 (0.1.5)
       aws-sdk (~> 2.1)
       faraday (~> 0.9)
-=======
-    faraday_middleware (0.11.0.1)
-      faraday (>= 0.7.4, < 1.0)
->>>>>>> upstream/master
     faraday_middleware-multi_json (0.0.6)
       faraday_middleware
       multi_json
@@ -936,11 +931,8 @@ DEPENDENCIES
   email_reply_trimmer (~> 0.1)
   email_spec (~> 1.6.0)
   factory_girl_rails (~> 4.7.0)
-<<<<<<< HEAD
-  faraday_middleware-aws-signers-v4
-=======
   faraday (~> 0.11.0)
->>>>>>> upstream/master
+  faraday_middleware-aws-signers-v4
   ffaker (~> 2.4)
   flay (~> 2.8.0)
   fog-aws (~> 0.9)

app/views/projects/blob/_header.html.haml

@@ -42,7 +42,6 @@
         = delete_blob_link
 
 = render 'projects/fork_suggestion'
-<<<<<<< HEAD
 
 - if license_allows_file_locks?
   :javascript
@@ -50,5 +49,3 @@
       '#{toggle_namespace_project_path_locks_path(@project.namespace, @project)}',
       '#{@path}'
     );
-=======
->>>>>>> upstream/master

config/database.yml.postgresql

@@ -10,13 +10,10 @@ production:
   # password:
   # host: localhost
   # port: 5432
-<<<<<<< HEAD
   # load_balancing:
   #   hosts:
   #     - host1.example.com
   #     - host2.example.com
-=======
->>>>>>> upstream/master
 
 #
 # Development specific

db/schema.rb

@@ -11,11 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-<<<<<<< HEAD
-ActiveRecord::Schema.define(version: 20170421113144) do
-=======
 ActiveRecord::Schema.define(version: 20170424142900) do
->>>>>>> upstream/master
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"

scripts/prepare_build.sh

@@ -17,7 +17,6 @@ if [ "$GITLAB_DATABASE" != 'mysql' ]; then
 fi
 
 cp config/database.yml.$GITLAB_DATABASE config/database.yml
-<<<<<<< HEAD
 
 # EE-only
 cp config/database_geo.yml.$GITLAB_DATABASE config/database_geo.yml
@@ -28,23 +27,15 @@ if [ "$GITLAB_DATABASE" = 'postgresql' ]; then
     # EE-only
     sed -i 's/# host:.*/host: postgres/g' config/database_geo.yml
 
-=======
-
-if [ "$GITLAB_DATABASE" = 'postgresql' ]; then
-    sed -i 's/# host:.*/host: postgres/g' config/database.yml
->>>>>>> upstream/master
 else # Assume it's mysql
     sed -i 's/username:.*/username: root/g' config/database.yml
     sed -i 's/password:.*/password:/g' config/database.yml
     sed -i 's/# host:.*/host: mysql/g' config/database.yml
-<<<<<<< HEAD
 
     # EE-only
     sed -i 's/username:.*/username: root/g' config/database_geo.yml
     sed -i 's/password:.*/password:/g' config/database_geo.yml
     sed -i 's/# host:.*/host: mysql/g' config/database_geo.yml
-=======
->>>>>>> upstream/master
 fi
 
 cp config/resque.yml.example config/resque.yml
@@ -66,10 +57,7 @@ if [ "$SETUP_DB" != "false" ]; then
     if [ "$GITLAB_DATABASE" = "mysql" ]; then
         bundle exec rake add_limits_mysql
     fi
-<<<<<<< HEAD
 
     # EE-only
     bundle exec rake geo:db:drop geo:db:create geo:db:schema:load geo:db:migrate
-=======
->>>>>>> upstream/master
 fi

spec/features/protected_branches_spec.rb

 require 'spec_helper'
 Dir["./spec/features/protected_branches/*.rb"].sort.each { |f| require f }
 
-<<<<<<< HEAD
-feature 'Protected Branches', feature: true, js: true do
-  include WaitForAjax
-
-=======
 feature 'Projected Branches', feature: true, js: true do
->>>>>>> upstream/master
   let(:user) { create(:user, :admin) }
   let(:project) { create(:project, :repository) }
 

spec/javascripts/blob/blob_fork_suggestion_spec.js

@@ -26,10 +26,6 @@ describe('BlobForkSuggestion', () => {
 
   it('showSuggestionSection', () => {
     blobForkSuggestion.showSuggestionSection('/foo', 'foo');
-<<<<<<< HEAD
-
-=======
->>>>>>> upstream/master
     expect(suggestionSection.classList.contains('hidden')).toEqual(false);
     expect(forkButton.getAttribute('href')).toEqual('/foo');
     expect(actionTextPiece.textContent).toEqual('foo');
@@ -37,10 +33,6 @@ describe('BlobForkSuggestion', () => {
 
   it('hideSuggestionSection', () => {
     blobForkSuggestion.hideSuggestionSection();
-<<<<<<< HEAD
-
-=======
->>>>>>> upstream/master
     expect(suggestionSection.classList.contains('hidden')).toEqual(true);
   });
 });

spec/support/test_env.rb

@@ -40,11 +40,8 @@ module TestEnv
     'wip'                                => 'b9238ee',
     'csv'                                => '3dd0896',
     'v1.1.0'                             => 'b83d6e3',
-<<<<<<< HEAD
-    'squash-large-files'                 => '54cec52'
-=======
-    'add-ipython-files'                  => '6d85bb69'
->>>>>>> upstream/master
+    'add-ipython-files'                  => '6d85bb69',
+    'squash-large-files'                 => '54cec52',
   }.freeze
 
   # gitlab-test-fork is a fork of gitlab-fork, but we don't necessarily