Skip to content
Unverified Commit ec6b2077 authored by Alex Hanselka's avatar Alex Hanselka
Browse files

Merge branch 'master' into 11-6-stable

* master:
  Revert "Merge branch 'fix/gb/encrypt-ci-build-token' into 'master'"
  Group level labels can be used in subgroups and projects
  Disable Sidekiq feature flag check if features table does not exist
  Fixes "introduced in..." syntax
  Move default brand title to a method
  Adds a reference to the echarts licence file
  Add missing license manager change attribution
  Upgrade gitlab-ui to latest and approve echarts dependency
  Security update of rails to version 4.2.11.
parents 81de623f 1a5e0ad3
Loading
Loading
Loading