From 2cd479e0941e0ee09cd75a1a288856d7e793211f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Wed, 26 Apr 2017 14:20:30 +0200
Subject: [PATCH] Resolve easy conflicts
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Rémy Coutable <remy@rymai.me>
---
.gitlab-ci.yml | 3 ---
CHANGELOG.md | 3 ---
Gemfile.lock | 14 +++-----------
app/views/projects/blob/_header.html.haml | 3 ---
config/database.yml.postgresql | 3 ---
db/schema.rb | 4 ----
scripts/prepare_build.sh | 12 ------------
spec/features/protected_branches_spec.rb | 6 ------
spec/javascripts/blob/blob_fork_suggestion_spec.js | 8 --------
spec/support/test_env.rb | 7 ++-----
10 files changed, 5 insertions(+), 58 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 358215c48f560..7dda5b6bb1246 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -54,10 +54,7 @@ stages:
services:
- postgres:latest
- redis:alpine
-<<<<<<< HEAD
- elasticsearch:5.1
-=======
->>>>>>> upstream/master
.use-mysql: &use-mysql
services:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7d7fb81b67c73..de7045bd751d5 100644
--- a/CHANGELOG.md
+++ b/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.
diff --git a/Gemfile.lock b/Gemfile.lock
index 3439613dc5577..7b90558ac7b8c 100644
--- a/Gemfile.lock
+++ b/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)
diff --git a/app/views/projects/blob/_header.html.haml b/app/views/projects/blob/_header.html.haml
index 627a69633dbd5..a1ecd96875d28 100644
--- a/app/views/projects/blob/_header.html.haml
+++ b/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
diff --git a/config/database.yml.postgresql b/config/database.yml.postgresql
index 73a8b6342f7d2..17102db7ebdc4 100644
--- a/config/database.yml.postgresql
+++ b/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
diff --git a/db/schema.rb b/db/schema.rb
index 50fa9c495fca2..fef1533607409 100644
--- a/db/schema.rb
+++ b/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"
diff --git a/scripts/prepare_build.sh b/scripts/prepare_build.sh
index 923f52ba45fc1..d9dc5e73a2a56 100755
--- a/scripts/prepare_build.sh
+++ b/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
diff --git a/spec/features/protected_branches_spec.rb b/spec/features/protected_branches_spec.rb
index 8c7434931b9c9..7e18e5f9df27e 100644
--- a/spec/features/protected_branches_spec.rb
+++ b/spec/features/protected_branches_spec.rb
@@ -1,13 +1,7 @@
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) }
diff --git a/spec/javascripts/blob/blob_fork_suggestion_spec.js b/spec/javascripts/blob/blob_fork_suggestion_spec.js
index 73b3237d894af..d1ab0a32f859d 100644
--- a/spec/javascripts/blob/blob_fork_suggestion_spec.js
+++ b/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);
});
});
diff --git a/spec/support/test_env.rb b/spec/support/test_env.rb
index e1432aa1faa3a..981435e48fd10 100644
--- a/spec/support/test_env.rb
+++ b/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
--
GitLab