Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-02-14

app/assets/javascripts/profile/profile.js

@@ -33,9 +33,6 @@ import flash from '../flash';
       $('input[name="user[multi_file]"]').on('change', this.setNewRepoCookie);
       $('#user_notification_email').on('change', this.submitForm);
       $('#user_notified_of_own_activity').on('change', this.submitForm);
-      $('.update-username').on('ajax:before', this.beforeUpdateUsername);
-      $('.update-username').on('ajax:complete', this.afterUpdateUsername);
-      $('.update-notifications').on('ajax:success', this.onUpdateNotifs);
       this.form.on('submit', this.onSubmitForm);
     }
 
@@ -48,21 +45,6 @@ import flash from '../flash';
       return this.saveForm();
     }
 
-    beforeUpdateUsername() {
-      $('.loading-username', this).removeClass('hidden');
-    }
-
-    afterUpdateUsername() {
-      $('.loading-username', this).addClass('hidden');
-      $('button[type=submit]', this).enable();
-    }
-
-    onUpdateNotifs(e, data) {
-      return data.saved ?
-        flash(__('Notification settings saved'), 'notice') :
-        flash(__('Failed to save new settings'));
-    }
-
     saveForm() {
       const self = this;
       const formData = new FormData(this.form[0]);

app/assets/javascripts/settings_panels.js

@@ -42,7 +42,7 @@ export default function initSettingsPanels() {
 
   if (location.hash) {
     const $target = $(location.hash);
-    if ($target.length && $target.hasClass('.settings')) {
+    if ($target.length && $target.hasClass('settings')) {
       expandSection($target);
     }
   }

app/assets/javascripts/sidebar/components/lock/lock_issue_sidebar.vue

@@ -72,7 +72,7 @@
       {{ sprintf(__('Lock %{issuableDisplayName}'), { issuableDisplayName: issuableDisplayName }) }}
       <button
         v-if="isEditable"
-        class="pull-right lock-edit btn btn-blank"
+        class="pull-right lock-edit"
         type="button"
         @click.prevent="toggleForm"
       >

app/assets/stylesheets/pages/issuable.scss

@@ -197,11 +197,18 @@
       margin-left: 0;
     }
 
+    a.edit-link:not([href]):hover {
+      color: rgba($avatar-border, .2);
+    }
+
+    .lock-edit, // uses same style, different js behaviour
     .edit-link {
+      @extend .btn-blank;
       color: $gl-text-color;
 
-      &:not([href]):hover {
-        color: rgba($avatar-border, .2);
+      &:hover {
+        text-decoration: underline;
+        color: $md-link-color;
       }
     }
   }

app/models/network/graph.rb

@@ -61,12 +61,9 @@ module Network
         @reserved[i] = []
       end
 
-      # n+1: https://gitlab.com/gitlab-org/gitlab-ce/issues/37436
-      Gitlab::GitalyClient.allow_n_plus_1_calls do
       commits_sort_by_ref.each do |commit|
         place_chain(commit)
       end
-      end
 
       # find parent spaces for not overlap lines
       @commits.each do |c|

app/services/delete_merged_branches_service.rb

@@ -6,10 +6,7 @@ class DeleteMergedBranchesService < BaseService
   def execute
     raise Gitlab::Access::AccessDeniedError unless can?(current_user, :push_code, project)
 
-    # n+1: https://gitlab.com/gitlab-org/gitlab-ce/issues/37438
-    Gitlab::GitalyClient.allow_n_plus_1_calls do
-      branches = project.repository.branch_names
-      branches = branches.select { |branch| project.repository.merged_to_root_ref?(branch) }
+    branches = project.repository.merged_branch_names
     # Prevent deletion of branches relevant to open merge requests
     branches -= merge_request_branch_names
     # Prevent deletion of protected branches
@@ -19,7 +16,6 @@ class DeleteMergedBranchesService < BaseService
       DeleteBranchService.new(project, current_user).execute(branch)
     end
   end
-  end
 
   private
 

changelogs/unreleased/43198-fix-settings-panel-expanding-when-fragment-hash-linked.yml

+---
+title: Fix settings panels not expanding when fragment hash linked
+merge_request: 17074
+author:
+type: fixed

changelogs/unreleased/remove_ldap_person_validation.yml

+---
+title: LDAP Person no longer throws exception on invalid entry
+merge_request:
+author:
+type: fixed

doc/development/query_count_limits.md

 # Query Count Limits
 
-Each controller or API endpoint is allowed to execute up to 100 SQL queries. In
-a production environment we'll only log an error in case this threshold is
-exceeded, but in a test environment we'll raise an error instead.
+Each controller or API endpoint is allowed to execute up to 100 SQL queries and
+in test environments we'll raise an error when this threshold is exceeded.
 
 ## Solving Failing Tests
 

doc/development/sidekiq_style_guide.md

@@ -17,6 +17,9 @@ would be `process_something`. If you're not sure what queue a worker uses,
 you can find it using `SomeWorker.queue`. There is almost never a reason to
 manually override the queue name using `sidekiq_options queue: :some_queue`.
 
+You must always add any new queues to `app/workers/all_queues.yml` otherwise
+your worker will not run.
+
 ## Queue Namespaces
 
 While different workers cannot share a queue, they can share a queue namespace.

lib/gitlab/ldap/person.rb

@@ -67,8 +67,6 @@ module Gitlab
         Rails.logger.debug { "Instantiating #{self.class.name} with LDIF:\n#{entry.to_ldif}" }
         @entry = entry
         @provider = provider
-
-        validate_entry
       end
 
       def name
@@ -121,19 +119,6 @@ module Gitlab
 
         entry.public_send(selected_attr) # rubocop:disable GitlabSecurity/PublicSend
       end
-
-      def validate_entry
-        allowed_attrs = self.class.ldap_attributes(config).map(&:downcase)
-
-        # Net::LDAP::Entry transforms keys to symbols. Change to strings to compare.
-        entry_attrs = entry.attribute_names.map { |n| n.to_s.downcase }
-        invalid_attrs = entry_attrs - allowed_attrs
-
-        if invalid_attrs.any?
-          raise InvalidEntryError,
-                "#{self.class.name} initialized with Net::LDAP::Entry containing invalid attributes(s): #{invalid_attrs}"
-        end
-      end
     end
   end
 end

lib/gitlab/query_limiting/transaction.rb

@@ -51,13 +51,7 @@ module Gitlab
 
         error = ThresholdExceededError.new(error_message)
 
-        if raise_error?
-          raise(error)
-        else
-          # Raven automatically logs to the Rails log if disabled, thus we don't
-          # need to manually log anything in case Sentry support is not enabled.
-          Raven.capture_exception(error)
-        end
+        raise(error) if raise_error?
       end
 
       def increment

spec/javascripts/settings_panels_spec.js

+import initSettingsPanels from '~/settings_panels';
+
+describe('Settings Panels', () => {
+  preloadFixtures('projects/ci_cd_settings.html.raw');
+
+  beforeEach(() => {
+    loadFixtures('projects/ci_cd_settings.html.raw');
+  });
+
+  describe('initSettingsPane', () => {
+    afterEach(() => {
+      location.hash = '';
+    });
+
+    it('should expand linked hash fragment panel', () => {
+      location.hash = '#js-general-pipeline-settings';
+
+      const pipelineSettingsPanel = document.querySelector('#js-general-pipeline-settings');
+      // Our test environment automatically expands everything so we need to clear that out first
+      pipelineSettingsPanel.classList.remove('expanded');
+
+      expect(pipelineSettingsPanel.classList.contains('expanded')).toBe(false);
+
+      initSettingsPanels();
+
+      expect(pipelineSettingsPanel.classList.contains('expanded')).toBe(true);
+    });
+  });
+});

spec/lib/gitlab/ldap/person_spec.rb

@@ -66,15 +66,6 @@ describe Gitlab::LDAP::Person do
     end
   end
 
-  describe '.validate_entry' do
-    it 'raises InvalidEntryError' do
-      entry['foo'] = 'bar'
-
-      expect { described_class.new(entry, 'ldapmain') }
-        .to raise_error(Gitlab::LDAP::Person::InvalidEntryError)
-    end
-  end
-
   describe '#name' do
     it 'uses the configured name attribute and handles values as an array' do
       name = 'John Doe'

spec/lib/gitlab/query_limiting/transaction_spec.rb

@@ -59,18 +59,6 @@ describe Gitlab::QueryLimiting::Transaction do
         expect { transaction.act_upon_results }
           .to raise_error(described_class::ThresholdExceededError)
       end
-
-      it 'reports the error in Sentry if raising an error is disabled' do
-        expect(transaction)
-          .to receive(:raise_error?)
-          .and_return(false)
-
-        expect(Raven)
-          .to receive(:capture_exception)
-          .with(an_instance_of(described_class::ThresholdExceededError))
-
-        transaction.act_upon_results
-      end
     end
   end
 

vendor/ingress/values.yaml

@@ -2,7 +2,8 @@ controller:
   image:
     tag: "0.10.2"
     repository: "quay.io/kubernetes-ingress-controller/nginx-ingress-controller"
-  stats.enabled: true
+  stats:
+    enabled: true
   podAnnotations:
     prometheus.io/scrape: "true"
     prometheus.io/port: "10254"