Commit ed9eeec9 authored by James Lopez's avatar James Lopez
Browse files

Merge branch '10-6-stable-ee-patch-1' into '10-6-stable-ee'

Prepare 10.6.1-ee release

See merge request gitlab-org/gitlab-ee!5112
parents 2ac2a07a 28351120
Loading
Loading
Loading
Loading
Loading
+5 −1
Original line number Diff line number Diff line
@@ -168,13 +168,17 @@ entry.
- Add one group board to Libre.
- Add support for filtering by source and target branch to merge requests API.

### Other (14 changes, 3 of them are from the community)
### Other (18 changes, 7 of them are from the community)

- Group MRs on issue page by project and namespace. !8494 (Jeff Stubler)
- Make oauth provider login generic. !8809 (Horatiu Eugen Vlad)
- Add email button to new issue by email. !10942 (Islam Wazery)
- Update vue component naming guidelines. !17018 (George Tsiolis)
- Added new design for promotion modals. !17197
- Update to github-linguist 5.3.x. !17241 (Ken Ding)
- update toml-rb to 1.0.0. !17259 (Ken Ding)
- Keep track of projects a user interacted with. !17327
- Moved o_auth/saml/ldap modules under gitlab/auth. !17359 (Horatiu Eugen Vlad)
- Enables eslint in codeclimate job. !17392
- Port Labels Select dropdown to Vue. !17411
- Add NOT NULL constraint to projects.namespace_id. !17448
+1 −0
Original line number Diff line number Diff line
// ECMAScript polyfills
import 'core-js/fn/array/fill';
import 'core-js/fn/array/find';
import 'core-js/fn/array/find-index';
import 'core-js/fn/array/from';
+2 −0
Original line number Diff line number Diff line
@@ -87,6 +87,8 @@ def feature_available?(feature)
    end

    def feature_available_in_plan?(feature)
      return true if ::License::ANY_PLAN_FEATURES.include?(feature)

      available_features = strong_memoize(:features_available_in_plan) do
        Hash.new do |h, feature|
          h[feature] = (plans.map(&:name) & self.class.plans_with_feature(feature)).any?
+7 −0
Original line number Diff line number Diff line
@@ -124,6 +124,13 @@ class License < ActiveRecord::Base
    'GitLab_ServiceDesk' => :service_desk
  }.freeze

  # Features added here are available for all namespaces.
  ANY_PLAN_FEATURES = %i[
    ci_cd_projects
    repository_mirrors
    github_project_service_integration
  ].freeze

  # Global features that cannot be restricted to only a subset of projects or namespaces.
  # Use `License.feature_available?(:feature)` to check if these features are available.
  # For all other features, use `project.feature_available?` or `namespace.feature_available?` when possible.
+2 −0
Original line number Diff line number Diff line
@@ -212,6 +212,8 @@ def set_temp_repository_as_main
        raise Gitlab::Shell::Error, 'Can not move original repository out of the way'
      end

      gitlab_shell.add_namespace(project.repository_storage_path, repository.disk_path)

      unless gitlab_shell.mv_repository(project.repository_storage_path, disk_path_temp, repository.disk_path)
        raise Gitlab::Shell::Error, 'Can not move temporary repository'
      end
Loading