Fix some conflicts

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

app/models/ci/build.rb

@@ -236,7 +236,6 @@ module Ci
 
     def has_trace?
       trace.exist?
-<<<<<<< HEAD
     end
 
     def trace=(data)
@@ -247,18 +246,6 @@ module Ci
       read_attribute(:trace)
     end
 
-=======
-    end
-
-    def trace=(data)
-      raise NotImplementedError
-    end
-
-    def old_trace
-      read_attribute(:trace)
-    end
-
->>>>>>> origin/master
     def erase_old_trace!
       write_attribute(:trace, nil)
       save

app/views/shared/_clone_panel.html.haml

@@ -23,10 +23,7 @@
   = text_field_tag :project_clone, default_url_to_repo(project), class: "js-select-on-focus form-control", readonly: true
   .input-group-btn
     = clipboard_button(target: '#project_clone', title: "Copy URL to clipboard")
-<<<<<<< HEAD
-=======
 
->>>>>>> origin/master
     = geo_button(modal_target: '#modal-geo-info') if Gitlab::Geo.secondary?
 
 :javascript

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: 20170406115029) do
-=======
 ActiveRecord::Schema.define(version: 20170407140450) do
->>>>>>> origin/master
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"

spec/models/ci/build_spec.rb

@@ -250,7 +250,6 @@ describe Ci::Build, :models do
       before do
         build.coverage_regex = '\(\d+.\d+\%\) covered'
         build.trace.set('Coverage 1033 / 1051 LOC (98.29%) covered')
-<<<<<<< HEAD
       end
 
       it "saves the correct extracted coverage value" do
@@ -319,76 +318,6 @@ describe Ci::Build, :models do
         build.project.update(runners_token: 'token')
       end
 
-=======
-      end
-
-      it "saves the correct extracted coverage value" do
-        expect(build.update_coverage).to be(true)
-        expect(build.coverage).to eq(98.29)
-      end
-    end
-  end
-
-  describe '#trace' do
-    subject { build.trace }
-
-    it { is_expected.to be_a(Gitlab::Ci::Trace) }
-  end
-
-  describe '#has_trace?' do
-    subject { build.has_trace? }
-
-    it "expect to call exist? method" do
-      expect_any_instance_of(Gitlab::Ci::Trace).to receive(:exist?)
-        .and_return(true)
-
-      is_expected.to be(true)
-    end
-  end
-
-  describe '#trace=' do
-    it "expect to fail trace=" do
-      expect { build.trace = "new" }.to raise_error(NotImplementedError)
-    end
-  end
-
-  describe '#old_trace' do
-    subject { build.old_trace }
-
-    before do
-      build.update_column(:trace, 'old trace')
-    end
-
-    it "expect to receive data from database" do
-      is_expected.to eq('old trace')
-    end
-  end
-
-  describe '#erase_old_trace!' do
-    subject { build.send(:read_attribute, :trace) }
-
-    before do
-      build.send(:write_attribute, :trace, 'old trace')
-    end
-
-    it "expect to receive data from database" do
-      build.erase_old_trace!
-
-      is_expected.to be_nil
-    end
-  end
-
-  describe '#hide_secrets' do
-    let(:subject) { build.hide_secrets(data) }
-
-    context 'hide runners token' do
-      let(:data) { 'new token data'}
-
-      before do
-        build.project.update(runners_token: 'token')
-      end
-
->>>>>>> origin/master
       it { is_expected.to eq('new xxxxx data') }
     end