Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-12-04

# Conflicts:
#	spec/models/ci/pipeline_spec.rb

[ci skip]

.gitlab-ci.yml

@@ -844,7 +844,7 @@ gitlab:assets:compile:
   only:
     - //@gitlab-org/gitlab-ce
     - //@gitlab-org/gitlab-ee
-    - //@gitlab/gitabhq
+    - //@gitlab/gitlabhq
     - //@gitlab/gitlab-ee
   tags:
     - gitlab-org-delivery

app/assets/stylesheets/pages/notes.scss

@@ -371,10 +371,10 @@ $note-form-margin-left: 72px;
 
           &::after {
             content: '';
-            width: 100%;
             height: 70px;
             position: absolute;
-            left: 0;
+            left: $gl-padding-24;
+            right: 0;
             bottom: 0;
             background: linear-gradient(rgba($white-light, 0.1) -100px, $white-light 100%);
           }

app/controllers/concerns/issuable_collections.rb

@@ -91,7 +91,7 @@ module IssuableCollections
     options = {
       scope: params[:scope],
       state: params[:state],
-      sort: set_sort_order_from_cookie || default_sort_order
+      sort: set_sort_order
     }
 
     # Used by view to highlight active option
@@ -113,6 +113,32 @@ module IssuableCollections
     'opened'
   end
 
+  def set_sort_order
+    set_sort_order_from_user_preference || set_sort_order_from_cookie || default_sort_order
+  end
+
+  def set_sort_order_from_user_preference
+    return unless current_user
+    return unless issuable_sorting_field
+
+    user_preference = current_user.user_preference
+
+    sort_param = params[:sort]
+    sort_param ||= user_preference[issuable_sorting_field]
+
+    if user_preference[issuable_sorting_field] != sort_param
+      user_preference.update_attribute(issuable_sorting_field, sort_param)
+    end
+
+    sort_param
+  end
+
+  # Implement default_sorting_field method on controllers
+  # to choose which column to store the sorting parameter.
+  def issuable_sorting_field
+    nil
+  end
+
   def set_sort_order_from_cookie
     sort_param = params[:sort] if params[:sort].present?
     # fallback to legacy cookie value for backward compatibility

app/models/concerns/token_authenticatable.rb

@@ -53,6 +53,11 @@ module TokenAuthenticatable
       define_method("reset_#{token_field}!") do
         strategy.reset_token!(self)
       end
+
+      define_method("#{token_field}_matches?") do |other_token|
+        token = read_attribute(token_field)
+        token.present? && ActiveSupport::SecurityUtils.variable_size_secure_compare(other_token, token)
+      end
     end
   end
 end

changelogs/unreleased/fix-multiple-comments-shade-overlap.yml

+---
+title: Fix multiple commits shade overlapping vertical discussion line
+merge_request: 23515
+author:
+type: fixed

doc/development/i18n/proofreader.md

@@ -43,7 +43,7 @@ are very appreciative of the work done by translators and proofreaders!
 - Greek
   - Proofreaders needed.
 - Hebrew
-  - Proofreaders needed.
+  - Yaron Shahrabani - [GitLab](https://gitlab.com/yarons), [Crowdin](https://crowdin.com/profile/YaronSh)
 - Hungarian
   - Proofreaders needed.
 - Indonesian

spec/controllers/concerns/issuable_collections_spec.rb

@@ -86,6 +86,7 @@ describe IssuableCollections do
 
     it 'only allows whitelisted params' do
       allow(controller).to receive(:cookies).and_return({})
+      allow(controller).to receive(:current_user).and_return(nil)
 
       finder_options = controller.send(:finder_options)
 

spec/models/ci/build_metadata_spec.rb

@@ -15,6 +15,8 @@ describe Ci::BuildMetadata do
   let(:build) { create(:ci_build, pipeline: pipeline) }
   let(:build_metadata) { build.metadata }
 
+  it_behaves_like 'having unique enum values'
+
   describe '#update_timeout_state' do
     subject { build_metadata }
 

spec/models/ci/build_trace_chunk_spec.rb

@@ -12,6 +12,8 @@ describe Ci::BuildTraceChunk, :clean_gitlab_redis_shared_state do
     described_class.new(build: build, chunk_index: chunk_index, data_store: data_store, raw_data: raw_data)
   end
 
+  it_behaves_like 'having unique enum values'
+
   before do
     stub_feature_flags(ci_enable_live_trace: true)
     stub_artifacts_object_storage

spec/models/ci/job_artifact_spec.rb

@@ -15,6 +15,8 @@ describe Ci::JobArtifact do
   it { is_expected.to delegate_method(:open).to(:file) }
   it { is_expected.to delegate_method(:exists?).to(:file) }
 
+  it_behaves_like 'having unique enum values'
+
   describe '.test_reports' do
     subject { described_class.test_reports }
 

spec/models/ci/pipeline_spec.rb

@@ -8,6 +8,8 @@ describe Ci::Pipeline, :mailer do
     create(:ci_empty_pipeline, status: :created, project: project)
   end
 
+  it_behaves_like 'having unique enum values'
+
   it { is_expected.to belong_to(:project) }
   it { is_expected.to belong_to(:user) }
   it { is_expected.to belong_to(:auto_canceled_by) }
@@ -1267,6 +1269,20 @@ describe Ci::Pipeline, :mailer do
 
           is_expected.to eq('custom/path')
         end
+<<<<<<< HEAD
+
+        it 'returns default when custom path is nil' do
+          allow(pipeline.project).to receive(:ci_config_path) { nil }
+
+          is_expected.to eq('.gitlab-ci.yml')
+        end
+
+        it 'returns default when custom path is empty' do
+          allow(pipeline.project).to receive(:ci_config_path) { '' }
+
+          is_expected.to eq('.gitlab-ci.yml')
+        end
+=======
 
         it 'returns default when custom path is nil' do
           allow(pipeline.project).to receive(:ci_config_path) { nil }
@@ -1279,6 +1295,7 @@ describe Ci::Pipeline, :mailer do
 
           is_expected.to eq('.gitlab-ci.yml')
         end
+>>>>>>> upstream/master
       end
     end
 

spec/models/ci/runner_spec.rb

 require 'spec_helper'
 
 describe Ci::Runner do
+  it_behaves_like 'having unique enum values'
+
   describe 'validation' do
     it { is_expected.to validate_presence_of(:access_level) }
     it { is_expected.to validate_presence_of(:runner_type) }

spec/models/ci/stage_spec.rb

@@ -3,6 +3,8 @@ require 'spec_helper'
 describe Ci::Stage, :models do
   let(:stage) { create(:ci_stage_entity) }
 
+  it_behaves_like 'having unique enum values'
+
   describe 'associations' do
     before do
       create(:ci_build, stage_id: stage.id)

spec/models/clusters/applications/ingress_spec.rb

@@ -3,6 +3,8 @@ require 'rails_helper'
 describe Clusters::Applications::Ingress do
   let(:ingress) { create(:clusters_applications_ingress) }
 
+  it_behaves_like 'having unique enum values'
+
   include_examples 'cluster application core specs', :clusters_applications_ingress
   include_examples 'cluster application status specs', :clusters_applications_ingress
   include_examples 'cluster application helm specs', :clusters_applications_ingress

spec/models/clusters/cluster_spec.rb

@@ -3,6 +3,8 @@
 require 'spec_helper'
 
 describe Clusters::Cluster do
+  it_behaves_like 'having unique enum values'
+
   it { is_expected.to belong_to(:user) }
   it { is_expected.to have_many(:cluster_projects) }
   it { is_expected.to have_many(:projects) }

spec/models/clusters/platforms/kubernetes_spec.rb

@@ -18,6 +18,8 @@ describe Clusters::Platforms::Kubernetes, :use_clean_rails_memory_store_caching
   it { is_expected.to delegate_method(:managed?).to(:cluster) }
   it { is_expected.to delegate_method(:kubernetes_namespace).to(:cluster) }
 
+  it_behaves_like 'having unique enum values'
+
   describe 'before_validation' do
     context 'when namespace includes upper case' do
       let(:kubernetes) { create(:cluster_platform_kubernetes, :configured, namespace: namespace) }

spec/models/commit_status_spec.rb

@@ -13,6 +13,8 @@ describe CommitStatus do
     create(:commit_status, pipeline: pipeline, **opts)
   end
 
+  it_behaves_like 'having unique enum values'
+
   it { is_expected.to belong_to(:pipeline) }
   it { is_expected.to belong_to(:user) }
   it { is_expected.to belong_to(:project) }

spec/models/deployment_spec.rb

@@ -16,6 +16,8 @@ describe Deployment do
   it { is_expected.to validate_presence_of(:ref) }
   it { is_expected.to validate_presence_of(:sha) }
 
+  it_behaves_like 'having unique enum values'
+
   describe '#scheduled_actions' do
     subject { deployment.scheduled_actions }
 

spec/models/gpg_signature_spec.rb

@@ -8,6 +8,8 @@ RSpec.describe GpgSignature do
   let(:gpg_key) { create(:gpg_key) }
   let(:gpg_key_subkey) { create(:gpg_key_subkey) }
 
+  it_behaves_like 'having unique enum values'
+
   describe 'associations' do
     it { is_expected.to belong_to(:project) }
     it { is_expected.to belong_to(:gpg_key) }

spec/models/internal_id_spec.rb

@@ -7,6 +7,8 @@ describe InternalId do
   let(:scope) { { project: project } }
   let(:init) { ->(s) { s.project.issues.size } }
 
+  it_behaves_like 'having unique enum values'
+
   context 'validations' do
     it { is_expected.to validate_presence_of(:usage) }
   end

spec/models/list_spec.rb

 require 'rails_helper'
 
 describe List do
+  it_behaves_like 'having unique enum values'
+
   describe 'relationships' do
     it { is_expected.to belong_to(:board) }
     it { is_expected.to belong_to(:label) }

spec/models/notification_setting_spec.rb

 require 'rails_helper'
 
 RSpec.describe NotificationSetting do
+  it_behaves_like 'having unique enum values'
+
   describe "Associations" do
     it { is_expected.to belong_to(:user) }
     it { is_expected.to belong_to(:source) }

spec/models/project_auto_devops_spec.rb

@@ -3,6 +3,8 @@ require 'spec_helper'
 describe ProjectAutoDevops do
   set(:project) { build(:project) }
 
+  it_behaves_like 'having unique enum values'
+
   it { is_expected.to belong_to(:project) }
 
   it { is_expected.to define_enum_for(:deploy_strategy) }

spec/models/project_spec.rb

@@ -4,6 +4,8 @@ describe Project do
   include ProjectForksHelper
   include GitHelpers
 
+  it_behaves_like 'having unique enum values'
+
   describe 'associations' do
     it { is_expected.to belong_to(:group) }
     it { is_expected.to belong_to(:namespace) }

spec/models/prometheus_metric_spec.rb

@@ -6,6 +6,8 @@ describe PrometheusMetric do
   subject { build(:prometheus_metric) }
   let(:other_project) { build(:project) }
 
+  it_behaves_like 'having unique enum values'
+
   it { is_expected.to belong_to(:project) }
   it { is_expected.to validate_presence_of(:title) }
   it { is_expected.to validate_presence_of(:query) }

spec/models/push_event_payload_spec.rb

 require 'spec_helper'
 
 describe PushEventPayload do
+  it_behaves_like 'having unique enum values'
+
   describe 'saving payloads' do
     it 'does not allow commit messages longer than 70 characters' do
       event = create(:push_event)

spec/models/resource_label_event_spec.rb

@@ -7,6 +7,8 @@ RSpec.describe ResourceLabelEvent, type: :model do
   let(:issue) { create(:issue) }
   let(:merge_request) { create(:merge_request) }
 
+  it_behaves_like 'having unique enum values'
+
   describe 'associations' do
     it { is_expected.to belong_to(:user) }
     it { is_expected.to belong_to(:issue) }

spec/models/user_callout_spec.rb

@@ -3,6 +3,8 @@ require 'rails_helper'
 describe UserCallout do
   let!(:callout) { create(:user_callout) }
 
+  it_behaves_like 'having unique enum values'
+
   describe 'relationships' do
     it { is_expected.to belong_to(:user) }
   end

spec/models/user_spec.rb

@@ -4,6 +4,8 @@ describe User do
   include ProjectForksHelper
   include TermsHelper
 
+  it_behaves_like 'having unique enum values'
+
   describe 'modules' do
     subject { described_class }
 

spec/support/active_record_enum.rb

+# frozen_string_literal: true
+
+shared_examples 'having unique enum values' do
+  described_class.defined_enums.each do |name, enum|
+    it "has unique values in #{name.inspect}" do
+      duplicated = enum.group_by(&:last).select { |key, value| value.size > 1 }
+
+      expect(duplicated).to be_empty,
+        "Duplicated values detected: #{duplicated.values.map(&Hash.method(:[]))}"
+    end
+  end
+end

spec/support/helpers/stub_configuration.rb

@@ -41,6 +41,11 @@ module StubConfiguration
     allow(Gitlab.config.gitlab).to receive_messages(to_settings(messages))
   end
 
+  def stub_default_url_options(host: "localhost", protocol: "http")
+    url_options = { host: host, protocol: protocol }
+    allow(Rails.application.routes).to receive(:default_url_options).and_return(url_options)
+  end
+
   def stub_gravatar_setting(messages)
     allow(Gitlab.config.gravatar).to receive_messages(to_settings(messages))
   end