Resolve conflicts

GITALY_SERVER_VERSION

-<<<<<<< HEAD
-0.24.0
-=======
 0.25.0
->>>>>>> upstream/master

Gemfile

@@ -406,11 +406,7 @@ gem 'sys-filesystem', '~> 1.1.6'
 gem 'net-ntp'
 
 # Gitaly GRPC client
-<<<<<<< HEAD
-gem 'gitaly', '~> 0.19.0'
-=======
 gem 'gitaly', '~> 0.21.0'
->>>>>>> upstream/master
 
 gem 'toml-rb', '~> 0.3.15', require: false
 

Gemfile.lock

@@ -293,11 +293,7 @@ GEM
       po_to_json (>= 1.0.0)
       rails (>= 3.2.0)
     gherkin-ruby (0.3.2)
-<<<<<<< HEAD
-    gitaly (0.19.0)
-=======
     gitaly (0.21.0)
->>>>>>> upstream/master
       google-protobuf (~> 3.1)
       grpc (~> 1.0)
     github-linguist (4.7.6)
@@ -1014,11 +1010,7 @@ DEPENDENCIES
   gettext (~> 3.2.2)
   gettext_i18n_rails (~> 1.8.0)
   gettext_i18n_rails_js (~> 1.2.0)
-<<<<<<< HEAD
-  gitaly (~> 0.19.0)
-=======
   gitaly (~> 0.21.0)
->>>>>>> upstream/master
   github-linguist (~> 4.7.0)
   gitlab-flowdock-git-hook (~> 1.0.1)
   gitlab-license (~> 1.0)
@@ -1061,10 +1053,7 @@ DEPENDENCIES
   mousetrap-rails (~> 1.4.6)
   mysql2 (~> 0.4.5)
   net-ldap
-<<<<<<< HEAD
   net-ntp
-=======
->>>>>>> upstream/master
   nokogiri (~> 1.6.7, >= 1.6.7.2)
   oauth2 (~> 1.4)
   octokit (~> 4.6.2)

app/controllers/admin/application_settings_controller.rb

@@ -78,14 +78,6 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
     params.delete(:domain_blacklist_raw) if params[:domain_blacklist_file]
 
     params.require(:application_setting).permit(
-<<<<<<< HEAD
-      permitted_application_setting_attributes
-    )
-  end
-
-  def permitted_application_setting_attributes
-    ApplicationSettingsHelper.visible_attributes + [
-=======
       visible_application_setting_attributes
     )
   end
@@ -93,7 +85,6 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
   def visible_application_setting_attributes
     ApplicationSettingsHelper.visible_attributes + [
       :domain_blacklist_file,
->>>>>>> upstream/master
       disabled_oauth_sign_in_sources: [],
       import_sources: [],
       repository_storages: [],

app/helpers/application_settings_helper.rb

 module ApplicationSettingsHelper
-<<<<<<< HEAD
   prepend EE::ApplicationSettingsHelper
   extend self
 
-=======
-  extend self
->>>>>>> upstream/master
   delegate  :gravatar_enabled?,
             :signup_enabled?,
             :password_authentication_enabled?,

app/views/projects/_flash_messages.html.haml

@@ -6,9 +6,6 @@
   - if current_user && can?(current_user, :download_code, project)
     = render 'shared/no_ssh'
     = render 'shared/no_password'
-<<<<<<< HEAD
     = render 'shared/shared_runners_minutes_limit', project: project
     - if project.above_size_limit?
       = render 'above_size_limit_warning'
-=======
->>>>>>> upstream/master

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

@@ -3,14 +3,9 @@
 - page_description @merge_request.description
 - page_card_attributes @merge_request.card_attributes
 - content_for :page_specific_javascripts do
-<<<<<<< HEAD
-  = page_specific_javascript_bundle_tag('common_vue')
-  = page_specific_javascript_bundle_tag('diff_notes')
-  = webpack_bundle_tag('issuable')
-=======
   = webpack_bundle_tag('common_vue')
   = webpack_bundle_tag('diff_notes')
->>>>>>> upstream/master
+  = webpack_bundle_tag('issuable')
 
 .merge-request{ 'data-mr-action': "#{j params[:tab].presence || 'show'}", 'data-url' => merge_request_path(@merge_request, format: :json), 'data-project-path' => project_path(@merge_request.project) }
   = render "projects/merge_requests/mr_title"

config/initializers/1_settings.rb

@@ -176,11 +176,9 @@ if Settings.ldap['enabled'] || Rails.env.test?
     server['attributes'] = {} if server['attributes'].nil?
     server['provider_name'] ||= "ldap#{key}".downcase
     server['provider_class'] = OmniAuth::Utils.camelize(server['provider_name'])
-<<<<<<< HEAD
     server['external_groups'] = [] if server['external_groups'].nil?
     server['sync_ssh_keys'] = 'sshPublicKey' if server['sync_ssh_keys'].to_s == 'true'
     Settings.ldap['servers'][key] = server
-=======
 
     # For backwards compatibility
     server['encryption'] ||= server['method']
@@ -199,7 +197,6 @@ if Settings.ldap['enabled'] || Rails.env.test?
       MSG
       Rails.logger.warn(message)
     end
->>>>>>> upstream/master
   end
 end
 

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: 20170719182937) do
-=======
 ActiveRecord::Schema.define(version: 20170725145659) do
->>>>>>> upstream/master
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -616,7 +612,6 @@ ActiveRecord::Schema.define(version: 20170725145659) do
 
   add_index "forked_project_links", ["forked_to_project_id"], name: "index_forked_project_links_on_forked_to_project_id", unique: true, using: :btree
 
-<<<<<<< HEAD
   create_table "geo_event_log", id: :bigserial, force: :cascade do |t|
     t.datetime "created_at", null: false
     t.integer "repository_updated_event_id", limit: 8
@@ -693,7 +688,7 @@ ActiveRecord::Schema.define(version: 20170725145659) do
     t.datetime "created_at"
     t.datetime "updated_at"
   end
-=======
+
   create_table "gpg_keys", force: :cascade do |t|
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
@@ -723,7 +718,6 @@ ActiveRecord::Schema.define(version: 20170725145659) do
   add_index "gpg_signatures", ["gpg_key_id"], name: "index_gpg_signatures_on_gpg_key_id", using: :btree
   add_index "gpg_signatures", ["gpg_key_primary_keyid"], name: "index_gpg_signatures_on_gpg_key_primary_keyid", using: :btree
   add_index "gpg_signatures", ["project_id"], name: "index_gpg_signatures_on_project_id", using: :btree
->>>>>>> upstream/master
 
   create_table "identities", force: :cascade do |t|
     t.string "extern_uid"
@@ -1425,10 +1419,7 @@ ActiveRecord::Schema.define(version: 20170725145659) do
     t.integer "cached_markdown_version"
     t.datetime "last_repository_updated_at"
     t.string "ci_config_path"
-<<<<<<< HEAD
     t.boolean "disable_overriding_approvers_per_merge_request"
-=======
->>>>>>> upstream/master
     t.text "delete_error"
   end
 
@@ -1967,18 +1958,15 @@ ActiveRecord::Schema.define(version: 20170725145659) do
   add_foreign_key "environments", "projects", name: "fk_d1c8c1da6a", on_delete: :cascade
   add_foreign_key "events", "projects", name: "fk_0434b48643", on_delete: :cascade
   add_foreign_key "forked_project_links", "projects", column: "forked_to_project_id", name: "fk_434510edb0", on_delete: :cascade
-<<<<<<< HEAD
   add_foreign_key "geo_event_log", "geo_repository_deleted_events", column: "repository_deleted_event_id", name: "fk_c4b1c1f66e", on_delete: :cascade
   add_foreign_key "geo_event_log", "geo_repository_renamed_events", column: "repository_renamed_event_id", name: "fk_86c84214ec", on_delete: :cascade
   add_foreign_key "geo_event_log", "geo_repository_updated_events", column: "repository_updated_event_id", on_delete: :cascade
   add_foreign_key "geo_repository_renamed_events", "projects", on_delete: :cascade
   add_foreign_key "geo_repository_updated_events", "projects", on_delete: :cascade
   add_foreign_key "index_statuses", "projects", name: "fk_74b2492545", on_delete: :cascade
-=======
   add_foreign_key "gpg_keys", "users", on_delete: :cascade
   add_foreign_key "gpg_signatures", "gpg_keys", on_delete: :nullify
   add_foreign_key "gpg_signatures", "projects", on_delete: :cascade
->>>>>>> upstream/master
   add_foreign_key "issue_assignees", "issues", name: "fk_b7d881734a", on_delete: :cascade
   add_foreign_key "issue_assignees", "users", name: "fk_5e0c8d9154", on_delete: :cascade
   add_foreign_key "issue_links", "issues", column: "source_id", name: "fk_c900194ff2", on_delete: :cascade

doc/administration/auth/ldap.md

@@ -281,9 +281,9 @@ group you can use the following syntax:
 (memberOf:1.2.840.113556.1.4.1941:=CN=My Group,DC=Example,DC=com)
 ```
 
-Find more information about this "LDAP_MATCHING_RULE_IN_CHAIN" filter at 
+Find more information about this "LDAP_MATCHING_RULE_IN_CHAIN" filter at
 https://msdn.microsoft.com/en-us/library/aa746475(v=vs.85).aspx. Support for
-nested members in the user filter should not be confused with 
+nested members in the user filter should not be confused with
 [group sync nested groups support (EE only)](https://docs.gitlab.com/ee/administration/auth/ldap-ee.html#supported-ldap-group-types-attributes).
 
 Please note that GitLab does not support the custom filter syntax used by
@@ -318,7 +318,6 @@ In other words, if an existing GitLab user wants to enable LDAP sign-in for
 themselves, they should check that their GitLab email address matches their
 LDAP email address, and then sign into GitLab via their LDAP credentials.
 
-<<<<<<< HEAD
 ## Adjusting LDAP user and group sync schedules
 
 You can manually configure LDAP user and group sync times by setting the
@@ -386,7 +385,7 @@ your installation compares before proceeding.
     ```
 
 1. [Restart GitLab](../restart_gitlab.md#installations-from-source) for the changes to take effect.
-=======
+
 ## Encryption
 
 ### TLS Server Authentication

doc/user/project/repository/reducing_the_repo_size_using_git.md

 # Reducing the repository size using Git
 
-<<<<<<< HEAD
-A GitLab administrator can set a [repository size limit][admin-repo-size] which
-will prevent you to exceed it.
-=======
 A GitLab Entrerprise Edition administrator can set a [repository size limit][admin-repo-size]
 which will prevent you to exceed it.
->>>>>>> upstream/master
 
 When a project has reached its size limit, you will not be able to push to it,
 create a new merge request, or merge existing ones. You will still be able to
@@ -81,10 +76,6 @@ As an alternative to `filter-branch`, you can use the `bfg` tool with a
 command like: `bfg --delete-files path/to/big_file.mpg`. Read the
 [BFG Repo-Cleaner][bfg] documentation for more information.
 
-<<<<<<< HEAD
-[admin-repo-size]: ../../admin_area/settings/account_and_limit_settings.md#repository-size-limit
-=======
 [admin-repo-size]: https://docs.gitlab.com/ee/user/admin_area/settings/account_and_limit_settings.html#repository-size-limit
->>>>>>> upstream/master
 [bfg]: https://rtyley.github.io/bfg-repo-cleaner/
 [gitscm]: https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History#The-Nuclear-Option:-filter-branch

lib/api/entities.rb

@@ -745,14 +745,10 @@ module API
 
     class ApplicationSetting < Grape::Entity
       expose :id
-<<<<<<< HEAD
-      expose(*ApplicationSettingsHelper.visible_attributes)
+      expose(*::ApplicationSettingsHelper.visible_attributes)
       expose(*EE::ApplicationSettingsHelper.repository_mirror_attributes, if: lambda do |_instance, _options|
         ::License.feature_available?(:repository_mirrors)
       end)
-=======
-      expose(*::ApplicationSettingsHelper.visible_attributes)
->>>>>>> upstream/master
       expose(:restricted_visibility_levels) do |setting, _options|
         setting.restricted_visibility_levels.map { |level| Gitlab::VisibilityLevel.string_level(level) }
       end

lib/api/merge_requests.rb

@@ -92,7 +92,6 @@ module API
           render_api_error!(errors, 400)
         end
 
-<<<<<<< HEAD
         def check_sha_param!(params, merge_request)
           if params[:sha] && merge_request.diff_head_sha != params[:sha]
             render_api_error!("SHA does not match HEAD of source branch: #{merge_request.diff_head_sha}", 409)
@@ -116,8 +115,6 @@ module API
             .preload(:notes, :author, :assignee, :milestone, :merge_request_diff, :labels)
         end
 
-=======
->>>>>>> upstream/master
         params :optional_params_ce do
           optional :description, type: String, desc: 'The description of the merge request'
           optional :assignee_id, type: Integer, desc: 'The ID of a user to assign the merge request'

lib/api/settings.rb

@@ -121,7 +121,6 @@ module API
       optional :terminal_max_session_time, type: Integer, desc: 'Maximum time for web terminal websocket connection (in seconds). Set to 0 for unlimited time.'
       optional :polling_interval_multiplier, type: BigDecimal, desc: 'Interval multiplier used by endpoints that perform polling. Set to 0 to disable polling.'
 
-<<<<<<< HEAD
       optional :help_text, type: String, desc: 'GitLab server administrator information'
       optional :elasticsearch_indexing, type: Boolean, desc: 'Enable Elasticsearch indexing'
       given elasticsearch_indexing: ->(val) { val } do
@@ -141,10 +140,6 @@ module API
       all_attributes = ::EE::ApplicationSettingsHelper.repository_mirror_attributes + ApplicationSettingsHelper.visible_attributes
       optional(*all_attributes)
       at_least_one_of(*all_attributes)
-=======
-      optional(*::ApplicationSettingsHelper.visible_attributes)
-      at_least_one_of(*::ApplicationSettingsHelper.visible_attributes)
->>>>>>> upstream/master
     end
     put "application/settings" do
       attrs = declared_params(include_missing: false)

lib/gitlab/ldap/adapter.rb

@@ -107,11 +107,7 @@ module Gitlab
       end
 
       def user_attributes
-<<<<<<< HEAD
-        %W(#{config.uid} cn mail dn memberof)
-=======
-        %W(#{config.uid} cn dn) + config.attributes['username'] + config.attributes['email']
->>>>>>> upstream/master
+        %W(#{config.uid} cn dn mail memberof) + config.attributes['username'] + config.attributes['email']
       end
     end
   end

lib/gitlab/ldap/config.rb

@@ -2,15 +2,13 @@
 module Gitlab
   module LDAP
     class Config
-<<<<<<< HEAD
       include ::EE::Gitlab::LDAP::Config
-=======
+
       NET_LDAP_ENCRYPTION_METHOD = {
         simple_tls: :simple_tls,
         start_tls:  :start_tls,
         plain:      nil
       }.freeze
->>>>>>> upstream/master
 
       attr_accessor :provider, :options
 
@@ -32,12 +30,6 @@ module Gitlab
         enabled_extras? ? servers : Array.wrap(servers.first)
       end
 
-      def self.available_servers
-        return [] unless enabled?
-
-        Array.wrap(servers.first)
-      end
-
       def self.providers
         servers.map { |server| server['provider_name'] }
       end

spec/features/projects/branches_spec.rb

 require 'spec_helper'
 
 describe 'Branches' do
-<<<<<<< HEAD
   include ProtectedBranchHelpers
 
-=======
->>>>>>> upstream/master
   let(:user) { create(:user) }
   let(:project) { create(:project, :public, :repository) }
   let(:repository) { project.repository }

spec/features/projects/show_project_spec.rb

@@ -8,11 +8,7 @@ describe 'Project show page', feature: true do
       sign_in(project.owner)
     end
 
-<<<<<<< HEAD
-    it 'shows flash error if deletion for project fails' do
-=======
     it 'shows error message if deletion for project fails' do
->>>>>>> upstream/master
       project.update_attributes(delete_error: "Something went wrong", pending_delete: false)
 
       visit project_path(project)

spec/features/protected_branches_spec.rb

 require 'spec_helper'
 
-<<<<<<< HEAD
 feature 'Protected Branches', :js do
   include ProtectedBranchHelpers
 
-=======
-feature 'Protected Branches', js: true do
->>>>>>> upstream/master
   let(:user) { create(:user, :admin) }
   let(:project) { create(:project, :repository) }
 

spec/lib/gitlab/git_access_spec.rb

@@ -454,7 +454,6 @@ describe Gitlab::GitAccess do
 
           permissions_matrix[role].each do |action, allowed|
             context action.to_s do
-<<<<<<< HEAD
               subject { access.send(:check_push_access!, changes[action]) }
 
               it do
@@ -482,8 +481,6 @@ describe Gitlab::GitAccess do
 
           permissions_matrix[role].each do |action, allowed|
             context action.to_s do
-=======
->>>>>>> upstream/master
               subject { access.send(:check_push_access!, changes[action]) }
 
               it do

spec/lib/gitlab/git_access_wiki_spec.rb

@@ -2,11 +2,7 @@ require 'spec_helper'
 
 describe Gitlab::GitAccessWiki do
   let(:access) { described_class.new(user, project, 'web', authentication_abilities: authentication_abilities, redirected_path: redirected_path) }
-<<<<<<< HEAD
-  let!(:project) { create(:project, :repository) }
-=======
   let(:project) { create(:project, :repository) }
->>>>>>> upstream/master
   let(:user) { create(:user) }
   let(:changes) { ['6f6d7e7ed 570e7b2ab refs/heads/master'] }
   let(:redirected_path) { nil }

spec/lib/gitlab/key_fingerprint_spec.rb

 require "spec_helper"
 
-<<<<<<< HEAD
 describe "SSH Keys" do
   let(:key)         { "ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAIEAiPWx6WM4lhHNedGfBpPJNPpZ7yKu+dnn1SJejgt4596k6YjzGGphH2TUxwKzxcKDKKezwkpfnxPkSMkuEspGRt/aZZ9wa++Oi7Qkr8prgHc4soW6NUlfDzpvZK2H5E7eQaSeP3SAwGmQKUFHCddNaP0L+hM7zhFNzjFvpaMgJw0=" }
   let(:fingerprint) { "3f:a2:ee:de:b5:de:53:c3:aa:2f:9c:45:24:4c:47:7b" }
@@ -8,7 +7,7 @@ describe "SSH Keys" do
   describe Gitlab::KeyFingerprint do
     describe "#fingerprint" do
       it "generates the key's fingerprint" do
-        expect(Gitlab::KeyFingerprint.new(key).fingerprint).to eq(fingerprint)
+        expect(described_class.new(key).fingerprint).to eq(fingerprint)
       end
     end
   end
@@ -18,15 +17,6 @@ describe "SSH Keys" do
       it "generates the key's fingerprint" do
         expect(Gitlab::InsecureKeyFingerprint.new(key.split[1]).fingerprint).to eq(fingerprint)
       end
-=======
-describe Gitlab::KeyFingerprint do
-  let(:key)         { "ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAIEAiPWx6WM4lhHNedGfBpPJNPpZ7yKu+dnn1SJejgt4596k6YjzGGphH2TUxwKzxcKDKKezwkpfnxPkSMkuEspGRt/aZZ9wa++Oi7Qkr8prgHc4soW6NUlfDzpvZK2H5E7eQaSeP3SAwGmQKUFHCddNaP0L+hM7zhFNzjFvpaMgJw0=" }
-  let(:fingerprint) { "3f:a2:ee:de:b5:de:53:c3:aa:2f:9c:45:24:4c:47:7b" }
-
-  describe "#fingerprint" do
-    it "generates the key's fingerprint" do
-      expect(described_class.new(key).fingerprint).to eq(fingerprint)
->>>>>>> upstream/master
     end
   end
 end

spec/lib/gitlab/ldap/access_spec.rb

 require 'spec_helper'
 
 describe Gitlab::LDAP::Access do
-<<<<<<< HEAD
   include LdapHelpers
-=======
->>>>>>> upstream/master
+
   let(:access) { described_class.new user }
   let(:user) { create(:omniauth_user) }
 

spec/lib/gitlab/ldap/adapter_spec.rb

@@ -5,11 +5,6 @@ describe Gitlab::LDAP::Adapter do
 
   let(:ldap) { double(:ldap) }
   let(:adapter) { ldap_adapter('ldapmain', ldap) }
-  let(:default_user_search_attributes) {  }
-
-  def user_search_attributes(id_name)
-    [id_name, 'cn', 'mail', 'dn', 'memberof']
-  end
 
   describe '#users' do
     before do
@@ -21,11 +16,7 @@ describe Gitlab::LDAP::Adapter do
       expect(adapter).to receive(:ldap_search) do |arg|
         expect(arg[:filter].to_s).to eq('(uid=johndoe)')
         expect(arg[:base]).to eq('dc=example,dc=com')
-<<<<<<< HEAD
-        expect(arg[:attributes]).to match(user_search_attributes('uid'))
-=======
         expect(arg[:attributes]).to match(%w{uid cn dn uid userid sAMAccountName mail email userPrincipalName})
->>>>>>> upstream/master
       end.and_return({})
 
       adapter.users('uid', 'johndoe')
@@ -35,11 +26,7 @@ describe Gitlab::LDAP::Adapter do
       expect(adapter).to receive(:ldap_search).with(
         base: 'uid=johndoe,ou=users,dc=example,dc=com',
         scope: Net::LDAP::SearchScope_BaseObject,
-<<<<<<< HEAD
-        attributes: user_search_attributes('uid'),
-=======
         attributes: %w{uid cn dn uid userid sAMAccountName mail email userPrincipalName},
->>>>>>> upstream/master
         filter: nil
       ).and_return({})
 
@@ -76,11 +63,7 @@ describe Gitlab::LDAP::Adapter do
     it 'uses the right uid attribute when non-default' do
       stub_ldap_config(uid: 'sAMAccountName')
       expect(adapter).to receive(:ldap_search).with(
-<<<<<<< HEAD
-        hash_including(attributes: user_search_attributes('sAMAccountName'))
-=======
         hash_including(attributes: %w{sAMAccountName cn dn uid userid sAMAccountName mail email userPrincipalName})
->>>>>>> upstream/master
       ).and_return({})
 
       adapter.users('sAMAccountName', 'johndoe')

spec/lib/gitlab/ldap/config_spec.rb

@@ -14,13 +14,8 @@ describe Gitlab::LDAP::Config do
       expect(config).to be_a described_class
     end
 
-<<<<<<< HEAD
-    it "raises an error if a unknow provider is used" do
-      expect{ described_class.new 'unknown' }.to raise_error(Gitlab::LDAP::Config::InvalidProvider)
-=======
     it 'raises an error if a unknown provider is used' do
-      expect{ described_class.new 'unknown' }.to raise_error(RuntimeError)
->>>>>>> upstream/master
+      expect{ described_class.new 'unknown' }.to raise_error(Gitlab::LDAP::Config::InvalidProvider)
     end
   end
 

spec/lib/gitlab/shell_spec.rb

@@ -169,7 +169,6 @@ describe Gitlab::Shell do
     end
   end
 
-<<<<<<< HEAD
   describe '#remove_key' do
     context 'when authorized_keys_enabled is true' do
       it 'removes trailing garbage' do
@@ -395,8 +394,6 @@ describe Gitlab::Shell do
     end
   end
 
-=======
->>>>>>> upstream/master
   describe Gitlab::Shell::KeyAdder do
     describe '#add_key' do
       it 'removes trailing garbage' do

spec/models/merge_request_diff_file_spec.rb

 require 'rails_helper'
 
 describe MergeRequestDiffFile do
-<<<<<<< HEAD
-=======
   describe '#diff' do
     let(:unpacked) { 'unpacked' }
     let(:packed) { [unpacked].pack('m0') }
@@ -28,7 +26,6 @@ describe MergeRequestDiffFile do
     end
   end
 
->>>>>>> upstream/master
   describe '#utf8_diff' do
     it 'does not raise error when the diff is binary' do
       subject.diff = "\x05\x00\x68\x65\x6c\x6c\x6f"

spec/models/namespace_spec.rb

@@ -230,7 +230,6 @@ describe Namespace do
     end
   end
 
-<<<<<<< HEAD
   describe '#actual_size_limit' do
     let(:namespace) { build(:namespace) }
 
@@ -243,8 +242,6 @@ describe Namespace do
     end
   end
 
-=======
->>>>>>> upstream/master
   describe '#rm_dir', 'callback' do
     let!(:project) { create(:project_empty_repo, namespace: namespace) }
     let(:repository_storage_path) { Gitlab.config.repositories.storages.default['path'] }

spec/requests/api/jobs_spec.rb

 require 'spec_helper'
 
 describe API::Jobs do
-<<<<<<< HEAD
-  let(:project) do
-=======
   let!(:project) do
->>>>>>> upstream/master
     create(:project, :repository, public_builds: false)
   end
 

spec/requests/api/settings_spec.rb

@@ -14,10 +14,6 @@ describe API::Settings, 'Settings' do
       expect(json_response['signin_enabled']).to be_truthy
       expect(json_response['repository_storages']).to eq(['default'])
       expect(json_response['password_authentication_enabled']).to be_truthy
-<<<<<<< HEAD
-=======
-      expect(json_response['repository_storages']).to eq(['default'])
->>>>>>> upstream/master
       expect(json_response['koding_enabled']).to be_falsey
       expect(json_response['koding_url']).to be_nil
       expect(json_response['plantuml_enabled']).to be_falsey
@@ -40,10 +36,6 @@ describe API::Settings, 'Settings' do
           default_projects_limit: 3,
           repository_storages: ['custom'],
           password_authentication_enabled: false,
-<<<<<<< HEAD
-=======
-          repository_storages: ['custom'],
->>>>>>> upstream/master
           koding_enabled: true,
           koding_url: 'http://koding.example.com',
           plantuml_enabled: true,

spec/services/git_push_service_spec.rb

@@ -14,7 +14,6 @@ describe GitPushService do
     project.team << [user, :master]
   end
 
-<<<<<<< HEAD
   describe 'with remote mirrors' do
     let(:project)  { create(:project, :remote_mirror) }
 
@@ -38,10 +37,6 @@ describe GitPushService do
 
   describe 'Push branches' do
     subject do
-=======
-  describe 'Push branches' do
-    subject do
->>>>>>> upstream/master
       execute_service(project, user, oldrev, newrev, ref)
     end
 
@@ -163,7 +158,6 @@ describe GitPushService do
     end
   end
 
-<<<<<<< HEAD
   describe "ES indexing" do
     before do
       stub_application_setting(elasticsearch_search: true, elasticsearch_indexing: true)
@@ -190,12 +184,6 @@ describe GitPushService do
     let!(:push_data) { push_data_from_service(project, user, oldrev, newrev, ref) }
     let(:event) { Event.find_by_action(Event::PUSHED) }
 
-=======
-  describe "Push Event" do
-    let!(:push_data) { push_data_from_service(project, user, oldrev, newrev, ref) }
-    let(:event) { Event.find_by_action(Event::PUSHED) }
-
->>>>>>> upstream/master
     it { expect(event).not_to be_nil }
     it { expect(event.project).to eq(project) }
     it { expect(event.action).to eq(Event::PUSHED) }
@@ -204,13 +192,8 @@ describe GitPushService do
     context "Updates merge requests" do
       it "when pushing a new branch for the first time" do
         expect(UpdateMergeRequestsWorker).to receive(:perform_async)
-<<<<<<< HEAD
-            .with(project.id, user.id, blankrev, 'newrev', ref)
-        execute_service(project, user, blankrev, 'newrev', ref)
-=======
                                                 .with(project.id, user.id, blankrev, 'newrev', ref)
         execute_service(project, user, blankrev, 'newrev', ref )
->>>>>>> upstream/master
       end
     end
 
@@ -554,21 +537,13 @@ describe GitPushService do
             let(:message) { "this is some work.\n\ncloses #1" }
 
             it "does not initiates one api call to jira server to close the issue" do
-<<<<<<< HEAD
-              execute_service(project, commit_author, oldrev, newrev, ref )
-=======
               execute_service(project, commit_author, oldrev, newrev, ref)
->>>>>>> upstream/master
 
               expect(WebMock).not_to have_requested(:post, jira_api_transition_url('JIRA-1'))
             end
 
             it "does not initiates one api call to jira server to comment on the issue" do
-<<<<<<< HEAD
-              execute_service(project, commit_author, oldrev, newrev, ref )
-=======
               execute_service(project, commit_author, oldrev, newrev, ref)
->>>>>>> upstream/master
 
               expect(WebMock).not_to have_requested(:post, jira_api_comment_url('JIRA-1')).with(
                 body: comment_body
@@ -581,21 +556,13 @@ describe GitPushService do
             let(:message) { "this is some work.\n\ncloses JIRA-1 \n\n closes #{issue.to_reference}" }
 
             it "initiates one api call to jira server to close the jira issue" do
-<<<<<<< HEAD
-              execute_service(project, commit_author, oldrev, newrev, ref )
-=======
               execute_service(project, commit_author, oldrev, newrev, ref)
->>>>>>> upstream/master
 
               expect(WebMock).to have_requested(:post, jira_api_transition_url('JIRA-1')).once
             end
 
             it "initiates one api call to jira server to comment on the jira issue" do
-<<<<<<< HEAD
-              execute_service(project, commit_author, oldrev, newrev, ref )
-=======
               execute_service(project, commit_author, oldrev, newrev, ref)
->>>>>>> upstream/master
 
               expect(WebMock).to have_requested(:post, jira_api_comment_url('JIRA-1')).with(
                 body: comment_body
@@ -603,22 +570,14 @@ describe GitPushService do
             end
 
             it "closes the internal issue" do
-<<<<<<< HEAD
-              execute_service(project, commit_author, oldrev, newrev, ref )
-=======
               execute_service(project, commit_author, oldrev, newrev, ref)
->>>>>>> upstream/master
               expect(issue.reload).to be_closed
             end
 
             it "adds a note indicating that the issue is now closed" do
               expect(SystemNoteService).to receive(:change_status)
                 .with(issue, project, commit_author, "closed", closing_commit)
-<<<<<<< HEAD
-              execute_service(project, commit_author, oldrev, newrev, ref )
-=======
               execute_service(project, commit_author, oldrev, newrev, ref)
->>>>>>> upstream/master
             end
           end
         end

spec/services/projects/destroy_service_spec.rb

@@ -143,11 +143,7 @@ describe Projects::DestroyService do
         it_behaves_like 'handles errors thrown during async destroy', "Failed to remove project repository"
       end
 
-<<<<<<< HEAD
-      context 'when `execute` raises any other error' do
-=======
       context 'when `execute` raises expected error' do
->>>>>>> upstream/master
         before do
           expect_any_instance_of(Project)
             .to receive(:destroy!).and_raise(StandardError.new("Other error message"))

spec/services/projects/transfer_service_spec.rb

@@ -37,11 +37,7 @@ describe Projects::TransferService do
     end
 
     it 'executes system hooks' do
-<<<<<<< HEAD
-      expect_any_instance_of(SystemHooksService).to receive(:execute_hooks_for).with(project, :transfer)
-=======
       expect_any_instance_of(described_class).to receive(:execute_system_hooks)
->>>>>>> upstream/master
 
       transfer_project(project, user, group)
     end
@@ -84,11 +80,7 @@ describe Projects::TransferService do
     end
 
     it "doesn't run system hooks" do
-<<<<<<< HEAD
-      expect_any_instance_of(SystemHooksService).not_to receive(:execute_hooks_for).with(project, :transfer)
-=======
       expect_any_instance_of(described_class).not_to receive(:execute_system_hooks)
->>>>>>> upstream/master
 
       attempt_project_transfer
     end

spec/support/test_env.rb

@@ -44,11 +44,8 @@ module TestEnv
     'v1.1.0'                             => 'b83d6e3',
     'add-ipython-files'                  => '93ee732',
     'add-pdf-file'                       => 'e774ebd',
-<<<<<<< HEAD
-    'squash-large-files'                 => '54cec52'
-=======
+    'squash-large-files'                 => '54cec52',
     'add-pdf-text-binary'                => '79faa7b'
->>>>>>> upstream/master
   }.freeze
 
   # gitlab-test-fork is a fork of gitlab-fork, but we don't necessarily