-
Merge branch 'master' into refactor/ci-config-add-global-entry · 2b48da22Grzegorz Bizon authored
* master: (285 commits) Bump recaptcha gem to 3.0.0 to remove deprecated stoken support Load knapsack in Rakefile only when is bundled Add License Finder information to contribution acceptance criteria. Add LGPLv2 to license whiltelist Instrument `RepositoryCheck::SingleRepositoryWorker` manually Bump nokogiri to 1.6.8 Fix alignment of wiki top area Update charcoal theme colors Update nav link font size and spacing; fix hamburger icon Fix control btn position Remove todos count tests in nav Test impersonation using img data attribute instead of username Implement compact side nav Fix knapsack for master Align links and tabs Add scrolling tabs to code subnav Finish styling sub nav Updated colors Fixed failing tests CHANGELOG item ... Conflicts: lib/gitlab/ci/config.rb spec/lib/gitlab/ci/config_spec.rb
2b48da22
×