CE->EE Resolve conflicts

dcd092d5 · Valery Sizov · 93f074d0 · dcd092d5 · dcd092d5 · dcd092d5
Commit dcd092d5 authored Dec 29, 2016 by Valery Sizov
9 changed files
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,11 +4,7 @@ entry.

 ## 8.15.2 (2016-12-27)

-<<<<<<< HEAD
- No changes.
-=======
 - Fix finding the latest pipeline. !8301
->>>>>>> 714f70a38df10e678bffde6e6081a97e31d8317c
 - Fix mr list timestamp alignment. !8271
 - Fix discussion overlap text in regular screens. !8273
 - Fixes mini-pipeline-graph dropdown animation and stage position in chrome, firefox and safari. !8282

--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -167,7 +167,6 @@ GEM
      railties (>= 4.2)
    dropzonejs-rails (0.7.2)
      rails (> 3.1)
-<<<<<<< HEAD
    elasticsearch (1.0.15)
      elasticsearch-api (= 1.0.15)
      elasticsearch-transport (= 1.0.15)
@@ -181,10 +180,7 @@ GEM
    elasticsearch-transport (1.0.15)
      faraday
      multi_json
-    email_reply_parser (0.5.8)
-=======
    email_reply_trimmer (0.1.6)
->>>>>>> 714f70a38df10e678bffde6e6081a97e31d8317c
    email_spec (1.6.0)
      launchy (~> 2.1)
      mail (~> 2.2)
@@ -870,13 +866,9 @@ DEPENDENCIES
  diffy (~> 3.1.0)
  doorkeeper (~> 4.2.0)
  dropzonejs-rails (~> 0.7.1)
-<<<<<<< HEAD
  elasticsearch-model
  elasticsearch-rails
-  email_reply_parser (~> 0.5.8)
-=======
  email_reply_trimmer (~> 0.1)
->>>>>>> 714f70a38df10e678bffde6e6081a97e31d8317c
  email_spec (~> 1.6.0)
  factory_girl_rails (~> 4.7.0)
  ffaker (~> 2.0.0)

--- a/app/services/issuable_base_service.rb
+++ b/app/services/issuable_base_service.rb
@@ -36,7 +36,6 @@ class IssuableBaseService < BaseService
    end
  end

-<<<<<<< HEAD
  def create_time_estimate_note(issuable)
    SystemNoteService.change_time_estimate(issuable, issuable.project, current_user)
  end
@@ -47,12 +46,11 @@ class IssuableBaseService < BaseService

  def filter_params(issuable)
    ability_name = :"admin_#{issuable.to_ability_name}"
+  end

-=======
  def filter_params(issuable)
    ability_name = :"admin_#{issuable.to_ability_name}"

->>>>>>> 714f70a38df10e678bffde6e6081a97e31d8317c
    unless can?(current_user, ability_name, project)
      params.delete(:milestone_id)
      params.delete(:labels)
@@ -170,10 +168,7 @@ class IssuableBaseService < BaseService
  def create(issuable)
    merge_slash_commands_into_params!(issuable)
    filter_params(issuable)
-<<<<<<< HEAD
    change_time_spent(issuable)
-=======
->>>>>>> 714f70a38df10e678bffde6e6081a97e31d8317c

    params.delete(:state_event)
    params[:author] ||= current_user
@@ -215,10 +210,7 @@ class IssuableBaseService < BaseService
    change_state(issuable)
    change_subscription(issuable)
    change_todo(issuable)
-<<<<<<< HEAD
    time_spent = change_time_spent(issuable)
-=======
->>>>>>> 714f70a38df10e678bffde6e6081a97e31d8317c
    filter_params(issuable)
    old_labels = issuable.labels.to_a
    old_mentioned_users = issuable.mentioned_users.to_a

--- a/app/views/layouts/nav/_dashboard.html.haml
+++ b/app/views/layouts/nav/_dashboard.html.haml
@@ -36,12 +36,6 @@
        %span
          Snippets

-<<<<<<< HEAD
    = link_to help_path, title: 'About GitLab EE', class: 'about-gitlab' do
      %span
        About GitLab EE
-=======
-    = link_to help_path, title: 'About GitLab CE', class: 'about-gitlab' do
-      %span
-        About GitLab CE
->>>>>>> 714f70a38df10e678bffde6e6081a97e31d8317c
--- a/app/views/projects/merge_requests/widget/_open.html.haml
+++ b/app/views/projects/merge_requests/widget/_open.html.haml
@@ -50,12 +50,8 @@
        - if mr_issues_mentioned_but_not_closing.present?
          #{"Issue".pluralize(mr_issues_mentioned_but_not_closing.size)}
          != markdown issues_sentence(mr_issues_mentioned_but_not_closing), pipeline: :gfm, author: @merge_request.author
-<<<<<<< HEAD
-          #{mr_issues_mentioned_but_not_closing.size > 1 ? 'are' : 'is'} mentioned but will not closed.
-=======
          #{mr_issues_mentioned_but_not_closing.size > 1 ? 'are' : 'is'} mentioned but will not be closed.
         
->>>>>>> 714f70a38df10e678bffde6e6081a97e31d8317c

  - if @merge_request.approvals.any?
    .mr-widget-footer.approved-by-users

--- a/doc/api/settings.md
+++ b/doc/api/settings.md
@@ -80,7 +80,6 @@ PUT /application/settings
 | `koding_enabled` | boolean | no | Enable Koding integration. Default is `false`. |
 | `koding_url` | string | yes (if `koding_enabled` is `true`) |  The Koding instance URL for integration. |
 | `disabled_oauth_sign_in_sources` | Array of strings | no | Disabled OAuth sign-in sources |
-<<<<<<< HEAD
 | `help_text` | string | no | GitLab server administrator information |
 | `elasticsearch_indexing` | boolean | no | Enable Elasticsearch indexing |
 | `elasticsearch_search` | boolean | no | Enable Elasticsearch search |
@@ -88,8 +87,6 @@ PUT /application/settings
 | `elasticsearch_port` | integer | no | The TCP/IP port that Elasticsearch listens to. The default value is 9200 |
 | `usage_ping_enabled` | boolean | no | Every week GitLab will report license usage back to GitLab, Inc.|
 | `repository_size_limit` | integer | no | Size limit per repository (MB) |
-=======
->>>>>>> 714f70a38df10e678bffde6e6081a97e31d8317c

 ```bash
 curl --request PUT --header "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" https://gitlab.example.com/api/v3/application/settings?signup_enabled=false&default_project_visibility=1

--- a/lib/api/settings.rb
+++ b/lib/api/settings.rb
@@ -87,10 +87,7 @@ module API
      given sentry_enabled: ->(val) { val } do
        requires :sentry_dsn, type: String, desc: 'Sentry Data Source Name'
      end
-<<<<<<< HEAD
-=======
      optional :repository_storage, type: String, desc: 'Storage paths for new projects'
->>>>>>> 714f70a38df10e678bffde6e6081a97e31d8317c
      optional :repository_checks_enabled, type: Boolean, desc: "GitLab will periodically run 'git fsck' in all project and wiki repositories to look for silent disk corruption issues."
      optional :koding_enabled, type: Boolean, desc: 'Enable Koding'
      given koding_enabled: ->(val) { val } do
@@ -106,7 +103,6 @@ module API
        requires :housekeeping_full_repack_period, type: Integer, desc: "Number of Git pushes after which a full 'git repack' is run."
        requires :housekeeping_gc_period, type: Integer, desc: "Number of Git pushes after which 'git gc' is run."
      end
-<<<<<<< HEAD
      # GitLab-EE specific settings
      optional :help_text, type: String, desc: 'GitLab server administrator information'
      optional :max_pages_size, type: Integer, desc: 'Maximum size of pages in MB'
@@ -121,8 +117,6 @@ module API
      optional :repository_storage, type: String, desc: 'The first entry in `repository_storages`. Deprecated, but retained for compatibility reasons'
      optional :repository_storages, type: Array[String], desc: 'A list of names of enabled storage paths, taken from `gitlab.yml`. New projects will be created in one of these stores, chosen at random.'
      optional :repository_size_limit, type: Integer, desc: 'Size limit per repository (MB)'
-=======
->>>>>>> 714f70a38df10e678bffde6e6081a97e31d8317c
      at_least_one_of :default_branch_protection, :default_project_visibility, :default_snippet_visibility,
                      :default_group_visibility, :restricted_visibility_levels, :import_sources,
                      :enabled_git_access_protocol, :gravatar_enabled, :default_projects_limit,
@@ -134,17 +128,11 @@ module API
                      :shared_runners_enabled, :max_artifacts_size, :container_registry_token_expire_delay,
                      :metrics_enabled, :sidekiq_throttling_enabled, :recaptcha_enabled,
                      :akismet_enabled, :admin_notification_email, :sentry_enabled,
-<<<<<<< HEAD
                      :repository_checks_enabled, :koding_enabled, :housekeeping_enabled,
                      :version_check_enabled, :email_author_in_body, :html_emails_enabled,
                      # GitLab-EE specific settings
                      :help_text, :max_pages_size, :elasticsearch_indexing, :usage_ping_enabled,
                      :repository_storage, :repository_storages, :repository_size_limit
-=======
-                      :repository_storage, :repository_checks_enabled, :koding_enabled,
-                      :version_check_enabled, :email_author_in_body, :html_emails_enabled,
-                      :housekeeping_enabled
->>>>>>> 714f70a38df10e678bffde6e6081a97e31d8317c
    end
    put "application/settings" do
      if current_settings.update_attributes(declared_params(include_missing: false))

--- a/lib/gitlab/checks/change_access.rb
+++ b/lib/gitlab/checks/change_access.rb
 module Gitlab
  module Checks
    class ChangeAccess
-<<<<<<< HEAD
      include PathLocksHelper
-      attr_reader :user_access, :project
-=======
+
      attr_reader :user_access, :project, :skip_authorization
->>>>>>> 714f70a38df10e678bffde6e6081a97e31d8317c

      def initialize(
        change, user_access:, project:, env: {}, skip_authorization: false)

--- a/lib/gitlab/git_access_wiki.rb
+++ b/lib/gitlab/git_access_wiki.rb
@@ -8,15 +8,10 @@ module Gitlab
      authentication_abilities.include?(:download_code) && user_access.can_do_action?(:download_wiki_code)
    end

-<<<<<<< HEAD
-    def change_access_check(change)
+    def check_single_change_access(change)
      if Gitlab::Geo.enabled? && Gitlab::Geo.secondary?
        build_status_object(false, "You can't push code to a secondary GitLab Geo node.")
      elsif user_access.can_do_action?(:create_wiki)
-=======
-    def check_single_change_access(change)
-      if user_access.can_do_action?(:create_wiki)
->>>>>>> 714f70a38df10e678bffde6e6081a97e31d8317c
        build_status_object(true)
      else
        build_status_object(false, "You are not allowed to write to this project's wiki.")