resolve more conflicts

app/controllers/concerns/service_params.rb

@@ -18,15 +18,11 @@ module ServiceParams
                     :add_pusher, :send_from_committer_email, :disable_diffs,
                     :external_wiki_url, :notify, :color,
                     :server_host, :server_port, :default_irc_uri, :enable_ssl_verification,
-<<<<<<< HEAD
-                    :jira_issue_transition_id,
+                    :jira_issue_transition_id, :url, :project_key,
 
                     ## EE Specific
                     :multiproject_enabled, :pass_unstable,
                     :jenkins_url, :project_name]
-=======
-                    :jira_issue_transition_id, :url, :project_key]
->>>>>>> 144358e98ee1b25b61854a3471e21e100ace9db5
 
   # Parameters to ignore if no value is specified
   FILTER_BLANK_PARAMS = [:password]

app/models/project.rb

@@ -59,14 +59,9 @@ class Project < ActiveRecord::Base
   belongs_to :namespace
   belongs_to :mirror_user, foreign_key: 'mirror_user_id', class_name: 'User'
 
-<<<<<<< HEAD
   has_one :push_rule, dependent: :destroy
-  has_one :last_event, -> {order 'events.created_at DESC'}, class_name: 'Event', foreign_key: 'project_id'
-  has_many :boards, dependent: :destroy
-=======
   has_one :last_event, -> {order 'events.created_at DESC'}, class_name: 'Event'
-  has_many :boards, before_add: :validate_board_limit, dependent: :destroy
->>>>>>> 144358e98ee1b25b61854a3471e21e100ace9db5
+  has_many :boards, dependent: :destroy
 
   # Project services
   has_many :services

app/views/projects/pipelines_settings/show.html.haml

@@ -87,24 +87,6 @@
                 tap --coverage-report=text-summary (NodeJS) -
                 %code ^Statements\s*:\s*([^%]+)
 
-<<<<<<< HEAD
-        .form-group
-          .checkbox
-            = f.label :public_builds do
-              = f.check_box :public_builds
-              %strong Public builds
-            .help-block Allow everyone to access builds traces for Public and Internal projects
-
-        - if @project.mirror?
-          = render 'shared/mirror_trigger_builds_setting', f: f
-
-        .form-group.append-bottom-default
-          = f.label :runners_token, "Runners token", class: 'label-light'
-          = f.text_field :runners_token, class: "form-control", placeholder: 'xEeFCaDAB89'
-          %p.help-block The secure token used to checkout project.
-
-=======
->>>>>>> 144358e98ee1b25b61854a3471e21e100ace9db5
         = f.submit 'Save changes', class: "btn btn-save"
 
 %hr

spec/models/project_services/jira_service_spec.rb

@@ -190,18 +190,10 @@ describe JiraService, models: true do
 
     context 'when gitlab.yml was initialized' do
       before do
-<<<<<<< HEAD
-        settings = { "jira" => {
-          "title" => "Jira",
-          "project_url" => "http://jira.sample/projects/project_a",
-          "issues_url" => "http://jira.sample/issues/:id",
-          "new_issue_url" => "http://jira.sample/projects/project_a/issues/new"
-=======
         settings = {
           "jira" => {
             "title" => "Jira",
             "url" => "http://jira.sample/projects/project_a"
->>>>>>> 144358e98ee1b25b61854a3471e21e100ace9db5
           }
         }
         allow(Gitlab.config).to receive(:issues_tracker).and_return(settings)

spec/requests/api/deploy_keys_spec.rb

@@ -3,22 +3,11 @@ require 'spec_helper'
 describe API::API, api: true  do
   include ApiHelpers
 
-<<<<<<< HEAD
   let(:user)  { create(:user) }
   let(:project) { create(:project, creator_id: user.id) }
+  let(:project2)    { create(:project, creator_id: user.id) }
   let!(:deploy_keys_project) { create(:deploy_keys_project, project: project) }
   let(:admin) { create(:admin) }
-=======
-  let(:user)        { create(:user) }
-  let(:admin)       { create(:admin) }
-  let(:project)     { create(:project, creator_id: user.id) }
-  let(:project2)    { create(:project, creator_id: user.id) }
-  let(:deploy_key)  { create(:deploy_key, public: true) }
-
-  let!(:deploy_keys_project) do
-    create(:deploy_keys_project, project: project, deploy_key: deploy_key)
-  end
->>>>>>> 144358e98ee1b25b61854a3471e21e100ace9db5
 
   describe 'GET /deploy_keys' do
     before { admin }
@@ -47,8 +36,6 @@ describe API::API, api: true  do
       end
     end
   end
-<<<<<<< HEAD
-=======
 
   describe 'GET /projects/:id/deploy_keys' do
     before { deploy_key }
@@ -183,5 +170,4 @@ describe API::API, api: true  do
       end
     end
   end
->>>>>>> 144358e98ee1b25b61854a3471e21e100ace9db5
 end