Resolve merge conflicts

CHANGELOG.md

@@ -5,10 +5,7 @@ entry.
 ## 8.17.0 (2017-02-22)
 
 - API: Fix file downloading. !0 (8267)
-<<<<<<< HEAD
 - Read true-up info from license and validate it. !1159
-=======
->>>>>>> ce/master
 - Changed composer installer script in the CI PHP example doc. !4342 (Jeffrey Cafferata)
 - Display fullscreen button on small screens. !5302 (winniehell)
 - Add system hook for when a project is updated (other than rename/transfer). !5711 (Tommy Beadle)

Gemfile.lock

@@ -917,10 +917,7 @@ DEPENDENCIES
   google-api-client (~> 0.8.6)
   grape (~> 0.18.0)
   grape-entity (~> 0.6.0)
-<<<<<<< HEAD
   gssapi
-=======
->>>>>>> ce/master
   haml_lint (~> 0.21.0)
   hamlit (~> 2.6.1)
   health_check (~> 2.2.0)

VERSION

-<<<<<<< HEAD
-8.17.0-ee-pre
-=======
-8.18.0-pre
->>>>>>> ce/master
+8.18.0-ee-pre

app/controllers/concerns/service_params.rb

@@ -60,7 +60,6 @@ module ServiceParams
     :username,
     :webhook
   ].freeze
-<<<<<<< HEAD
 
   ALLOWED_PARAMS_EE = [
     :jenkins_url,
@@ -68,8 +67,6 @@ module ServiceParams
     :pass_unstable,
     :project_name
   ].freeze
-=======
->>>>>>> ce/master
 
   # Parameters to ignore if no value is specified
   FILTER_BLANK_PARAMS = [:password].freeze

app/helpers/tab_helper.rb

@@ -99,11 +99,7 @@ module TabHelper
       return 'active'
     end
 
-<<<<<<< HEAD
     if %w(services hooks deploy_keys protected_branches push_rules).include? controller.controller_name
-=======
-    if %w(services hooks deploy_keys protected_branches).include? controller.controller_name
->>>>>>> ce/master
       "active"
     end
   end

app/models/project.rb

@@ -22,12 +22,6 @@ class Project < ActiveRecord::Base
 
   extend Gitlab::ConfigHelper
 
-<<<<<<< HEAD
-=======
-  class BoardLimitExceeded < StandardError; end
-
-  NUMBER_OF_PERMITTED_BOARDS = 1
->>>>>>> ce/master
   UNKNOWN_IMPORT_URL = 'http://unknown.git'.freeze
 
   cache_markdown_field :description, pipeline: :description

app/models/protected_branch.rb

@@ -8,13 +8,8 @@ class ProtectedBranch < ActiveRecord::Base
   has_many :merge_access_levels, dependent: :destroy
   has_many :push_access_levels, dependent: :destroy
 
-<<<<<<< HEAD
   validates :merge_access_levels, length: { minimum: 0 }
   validates :push_access_levels, length: { minimum: 0 }
-=======
-  validates :merge_access_levels, length: { is: 1, message: "are restricted to a single instance per protected branch." }
-  validates :push_access_levels, length: { is: 1, message: "are restricted to a single instance per protected branch." }
->>>>>>> ce/master
 
   accepts_nested_attributes_for :push_access_levels, allow_destroy: true
   accepts_nested_attributes_for :merge_access_levels, allow_destroy: true

app/views/layouts/nav/_admin.html.haml

@@ -35,14 +35,11 @@
           Abuse Reports
           %span.badge.count= number_with_delimiter(AbuseReport.count(:all))
 
-<<<<<<< HEAD
     = nav_link(controller: :licenses) do
       = link_to admin_license_path, title: 'License' do
         %span
           License
 
-=======
->>>>>>> ce/master
     - if akismet_enabled?
       = nav_link(controller: :spam_logs) do
         = link_to admin_spam_logs_path, title: "Spam Logs" do

app/views/layouts/nav/_group.html.haml

@@ -21,14 +21,7 @@
           Merge Requests
           - merge_requests = MergeRequestsFinder.new(current_user, group_id: @group.id, state: 'opened', non_archived: true).execute
           %span.badge.count= number_with_delimiter(merge_requests.count)
-<<<<<<< HEAD
-    = nav_link(controller: [:group_members]) do
-      = link_to group_group_members_path(@group), title: 'Members' do
-        %span
-          Members
     = nav_link(controller: [:stats]) do
       = link_to group_analytics_path(@group), title: 'Contribution Analytics', data: {placement: 'right'} do
         %span
           Contribution Analytics
-=======
->>>>>>> ce/master

doc/api/merge_requests.md

@@ -884,11 +884,7 @@ notifications from that merge request. If the user is
 not subscribed to the merge request, the status code `304` is returned.
 
 ```
-<<<<<<< HEAD
-POST /projects/:id/merge_requests/:merge_request_id/subscribe
-=======
 POST /projects/:id/merge_requests/:merge_request_id/unsubscribe
->>>>>>> ce/master
 ```
 
 | Attribute | Type | Required | Description |
@@ -897,11 +893,7 @@ POST /projects/:id/merge_requests/:merge_request_id/unsubscribe
 | `merge_request_id` | integer | yes   | The ID of the merge request |
 
 ```bash
-<<<<<<< HEAD
-curl --request POST --header "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" https://gitlab.example.com/api/v3/projects/5/merge_requests/17/subscribe
-=======
 curl --request POST --header "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" https://gitlab.example.com/api/v3/projects/5/merge_requests/17/unsubscribe
->>>>>>> ce/master
 ```
 
 Example response:

doc/api/projects.md

@@ -1201,7 +1201,20 @@ Parameters:
 | `order_by` | string | no | Return requests ordered by `id`, `name`, `created_at` or `last_activity_at` fields |
 | `sort` | string | no | Return requests sorted in `asc` or `desc` order |
 
-<<<<<<< HEAD
+## Start the Housekeeping task for a Project
+
+>**Note:** This feature was introduced in GitLab 9.0
+
+```
+POST /projects/:id/housekeeping
+>>>>>>> ce/master
+```
+
+Parameters:
+
+| Attribute | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `id` | integer/string | yes | The ID of the project or NAMESPACE/PROJECT_NAME |
 
 ## Push Rules (EE only)
 
@@ -1239,14 +1252,6 @@ Adds a push rule to a specified project.
 
 ```
 POST /projects/:id/push_rule
-=======
-## Start the Housekeeping task for a Project
-
->**Note:** This feature was introduced in GitLab 9.0
-
-```
-POST /projects/:id/housekeeping
->>>>>>> ce/master
 ```
 
 Parameters:
@@ -1254,7 +1259,6 @@ Parameters:
 | Attribute | Type | Required | Description |
 | --------- | ---- | -------- | ----------- |
 | `id` | integer/string | yes | The ID of the project or NAMESPACE/PROJECT_NAME |
-<<<<<<< HEAD
 | `deny_delete_tag` | boolean | no | Deny deleting a tag |
 | `member_check` | boolean | no | Restrict commits by author (email) to existing GitLab users |
 | `prevent_secrets` | boolean | no | GitLab will reject any files that are likely to contain secrets |
@@ -1299,5 +1303,3 @@ Parameters:
 
 Note the JSON response differs if the push rule is available or not. If the project push rule
 is available before it is returned in the JSON response or an empty response is returned.
-=======
->>>>>>> ce/master

doc/api/v3_to_v4.md

@@ -26,13 +26,8 @@ changes are in V4:
   - `/gitignores/:key`
   - `/gitlab_ci_ymls/:key`
   - `/dockerfiles/:key`
-<<<<<<< HEAD
-- Moved `DELETE /todos` to `POST /todos/mark_as_done` and `DELETE /todos/:todo_id` to `POST /todos/:todo_id/mark_as_done`
-- Moved `/projects/fork/:id` to `/projects/:id/fork` [!8940](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8940)
-=======
 - Moved `/projects/fork/:id` to `/projects/:id/fork` [!8940](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8940)
 - Moved `DELETE /todos` to `POST /todos/mark_as_done` and `DELETE /todos/:todo_id` to `POST /todos/:todo_id/mark_as_done` [!9410](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9410)
->>>>>>> ce/master
 - Endpoints `/projects/owned`, `/projects/visible`, `/projects/starred` & `/projects/all` are consolidated into `/projects` using query parameters [!8962](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8962)
 - Return pagination headers for all endpoints that return an array [!8606](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8606)
 - Removed `DELETE projects/:id/deploy_keys/:key_id/disable`. Use `DELETE projects/:id/deploy_keys/:key_id` instead [!9366](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9366)

lib/api/builds.rb

@@ -11,11 +11,7 @@ module API
       helpers do
         params :optional_scope do
           optional :scope, types: [String, Array[String]], desc: 'The scope of builds to show',
-<<<<<<< HEAD
-                           values:  %w(pending running failed success canceled),
-=======
                            values: ::CommitStatus::AVAILABLE_STATUSES,
->>>>>>> ce/master
                            coerce_with: ->(scope) {
                              if scope.is_a?(String)
                                [scope]

lib/api/v3/notes.rb

@@ -84,10 +84,6 @@ module API
               end
 
               note = ::Notes::CreateService.new(user_project, current_user, opts).execute
-<<<<<<< HEAD
-
-=======
->>>>>>> ce/master
               if note.valid?
                 present note, with: ::API::V3::Entities.const_get(note.class.name)
               else

lib/gitlab/chat_commands/presenters/issue_base.rb

@@ -33,14 +33,11 @@ module Gitlab
             {
               title: "Labels",
               value: @resource.labels.any? ? @resource.label_names.join(', ') : "_None_",
-<<<<<<< HEAD
               short: true
             },
             {
               title: "Weight",
               value: @resource.weight? ? @resource.weight : "_None_",
-=======
->>>>>>> ce/master
               short: true
             }
           ]

lib/gitlab/git_access.rb

@@ -16,12 +16,8 @@ module Gitlab
 
     DOWNLOAD_COMMANDS = %w{ git-upload-pack git-upload-archive }.freeze
     PUSH_COMMANDS = %w{ git-receive-pack }.freeze
-<<<<<<< HEAD
     GIT_ANNEX_COMMANDS = %w{ git-annex-shell }.freeze
     ALL_COMMANDS = DOWNLOAD_COMMANDS + PUSH_COMMANDS + GIT_ANNEX_COMMANDS
-=======
-    ALL_COMMANDS = DOWNLOAD_COMMANDS + PUSH_COMMANDS
->>>>>>> ce/master
 
     attr_reader :actor, :project, :protocol, :user_access, :authentication_abilities
 

lib/gitlab/saml/user.rb

@@ -34,18 +34,15 @@ module Gitlab
             else
               true
             end
-<<<<<<< HEAD
         end
 
         if admin_groups_enabled? && @user
-          @user.admin = 
+          @user.admin =
             if (auth_hash.groups & Gitlab::Saml::Config.admin_groups).empty?
               false
             else
               true
             end
-=======
->>>>>>> ce/master
         end
 
         @user

lib/gitlab/shell.rb

@@ -84,7 +84,6 @@ module Gitlab
       # to silently kill the process without knowing we are timing out here.
       output, status = Popen.popen([gitlab_shell_projects_path, 'import-project',
                                     storage, "#{name}.git", url, '800'])
-<<<<<<< HEAD
       raise Error, output unless status.zero?
       true
     end
@@ -132,8 +131,6 @@ module Gitlab
       args << '--no-tags' if no_tags
 
       output, status = Popen.popen(args)
-=======
->>>>>>> ce/master
       raise Error, output unless status.zero?
       true
     end

lib/gitlab/upgrader.rb

@@ -44,13 +44,8 @@ module Gitlab
 
     def latest_version_raw
       git_tags = fetch_git_tags
-<<<<<<< HEAD
       git_tags = git_tags.select { |version| version =~ /v\d+\.\d+\.\d+-ee\Z/ }
       git_versions = git_tags.map { |tag| Gitlab::VersionInfo.parse(tag.match(/v\d+\.\d+\.\d+-ee/).to_s) }
-=======
-      git_tags = git_tags.select { |version| version =~ /v\d+\.\d+\.\d+\Z/ }
-      git_versions = git_tags.map { |tag| Gitlab::VersionInfo.parse(tag.match(/v\d+\.\d+\.\d+/).to_s) }
->>>>>>> ce/master
       "v#{git_versions.sort.last}"
     end
 
@@ -63,11 +58,7 @@ module Gitlab
       {
         "Stash changed files" => %W(#{Gitlab.config.git.bin_path} stash),
         "Get latest code" => %W(#{Gitlab.config.git.bin_path} fetch),
-<<<<<<< HEAD
         "Switch to new version" => %W(#{Gitlab.config.git.bin_path} checkout v#{latest_version}-ee),
-=======
-        "Switch to new version" => %W(#{Gitlab.config.git.bin_path} checkout v#{latest_version}),
->>>>>>> ce/master
         "Install gems" => %w(bundle),
         "Migrate DB" => %w(bundle exec rake db:migrate),
         "Recompile assets" => %w(bundle exec rake yarn:install gitlab:assets:clean gitlab:assets:compile),

lib/tasks/gitlab/info.rake

@@ -14,19 +14,13 @@ namespace :gitlab do
       rake_version = run_and_match(%w(rake --version), /[\d\.]+/).try(:to_s)
       # check redis version
       redis_version = run_and_match(%w(redis-cli --version), /redis-cli (\d+\.\d+\.\d+)/).to_a
-<<<<<<< HEAD
       # check for system defined proxies
       proxies = Gitlab::Proxy.detect_proxy.map{|k, v| "#{k}: #{v}"}.join("\n\t\t")
-=======
->>>>>>> ce/master
 
       puts ""
       puts "System information".color(:yellow)
       puts "System:\t\t#{os_name || "unknown".color(:red)}"
-<<<<<<< HEAD
       puts "Proxy:\t\t#{proxies.present? ? proxies.color(:green) : "no"}"
-=======
->>>>>>> ce/master
       puts "Current User:\t#{run_command(%w(whoami))}"
       puts "Using RVM:\t#{rvm_version.present? ? "yes".color(:green) : "no"}"
       puts "RVM Version:\t#{rvm_version}" if rvm_version.present?
@@ -46,7 +40,7 @@ namespace :gitlab do
       http_clone_url = project.http_url_to_repo
       ssh_clone_url  = project.ssh_url_to_repo
 
-      geo_node_type = 
+      geo_node_type =
         if Gitlab::Geo.current_node
           Gitlab::Geo.current_node.primary ? 'Primary' : 'Secondary'
         else

spec/lib/gitlab/git_access_spec.rb

@@ -249,7 +249,6 @@ describe Gitlab::GitAccess, lib: true do
           permissions_matrix[role].each do |action, allowed|
             context action do
               subject { access.send(:check_push_access!, changes[action]) }
-<<<<<<< HEAD
 
               it do
                 if allowed
@@ -277,8 +276,6 @@ describe Gitlab::GitAccess, lib: true do
           permissions_matrix[role].each do |action, allowed|
             context action do
               subject { access.send(:check_push_access!, changes[action]) }
-=======
->>>>>>> ce/master
 
               it do
                 if allowed

spec/lib/gitlab/upgrader_spec.rb

@@ -18,7 +18,6 @@ describe Gitlab::Upgrader, lib: true do
   describe 'latest_version_raw' do
     it 'gets the latest version from tags' do
       allow(upgrader).to receive(:fetch_git_tags).and_return([
-<<<<<<< HEAD
         '6f0733310546402c15d3ae6128a95052f6c8ea96  refs/tags/v7.1.1-ee',
         'facfec4b242ce151af224e20715d58e628aa5e74  refs/tags/v7.1.1-ee^{}',
         'f7068d99c79cf79befbd388030c051bb4b5e86d4  refs/tags/v7.10.4-ee',
@@ -29,18 +28,6 @@ describe Gitlab::Upgrader, lib: true do
         'dac18e7728013a77410e926a1e64225703754a2d  refs/tags/v7.11.2-ee^{}',
         '0bf21fd4b46c980c26fd8c90a14b86a4d90cc950  refs/tags/v7.9.4-ee',
         'b10de29edbaff7219547dc506cb1468ee35065c3  refs/tags/v7.9.4-ee^{}'
-=======
-        '6f0733310546402c15d3ae6128a95052f6c8ea96  refs/tags/v7.1.1',
-        'facfec4b242ce151af224e20715d58e628aa5e74  refs/tags/v7.1.1^{}',
-        'f7068d99c79cf79befbd388030c051bb4b5e86d4  refs/tags/v7.10.4',
-        '337225a4fcfa9674e2528cb6d41c46556bba9dfa  refs/tags/v7.10.4^{}',
-        '880e0ba0adbed95d087f61a9a17515e518fc6440  refs/tags/v7.11.1',
-        '6584346b604f981f00af8011cd95472b2776d912  refs/tags/v7.11.1^{}',
-        '43af3e65a486a9237f29f56d96c3b3da59c24ae0  refs/tags/v7.11.2',
-        'dac18e7728013a77410e926a1e64225703754a2d  refs/tags/v7.11.2^{}',
-        '0bf21fd4b46c980c26fd8c90a14b86a4d90cc950  refs/tags/v7.9.4',
-        'b10de29edbaff7219547dc506cb1468ee35065c3  refs/tags/v7.9.4^{}'
->>>>>>> ce/master
       ])
       expect(upgrader.latest_version_raw).to eq("v7.11.2")
     end

spec/requests/lfs_http_spec.rb

@@ -690,13 +690,8 @@ describe 'Git LFS API and storage' do
               {
                 'operation' => 'upload',
                 'objects' => [
-<<<<<<< HEAD
                   { 'oid' => sample_oid,
                     'size' => sample_size }
-=======
-                  { 'oid' => '91eff75a492a3ed0dfcb544d7f31326bc4014c8551849c192fd1e48d4dd2c897',
-                    'size' => 1575078 }
->>>>>>> ce/master
                 ]
               }
             end

spec/support/test_env.rb

@@ -38,12 +38,8 @@ module TestEnv
     'conflict-too-large'                 => '39fa04f',
     'deleted-image-test'                 => '6c17798',
     'wip'                                => 'b9238ee',
-<<<<<<< HEAD
     'csv'                                => '3dd0896',
     'squash-large-files'                 => '54cec52'
-=======
-    'csv'                                => '3dd0896'
->>>>>>> ce/master
   }.freeze
 
   # gitlab-test-fork is a fork of gitlab-fork, but we don't necessarily