Skip to content
Snippets Groups Projects
Commit 8aef0ef6 authored by Lin Jen-Shin's avatar Lin Jen-Shin
Browse files

Merge remote-tracking branch 'ee/master' into 40622-use-left-right-and-max-count-ee

* ee/master: (129 commits)
  Update CHANGELOG.md for 10.3.3
  Update CHANGELOG-EE.md for 10.3.3-ee
  use different counts for wiki
  Add missing wiki counts to prometheus metrics
  Include the Namespace Id in purchase link for GL.com plans
  Update LICENSE to clean up formatting
  Adjust content width for User Settings, Pipeline quota
  Use add_master instead
  Copy changes from EE master
  Fix yarn.lock by `yarn install`
  Fix package dependency
  Remove duplicated class
  Resolve yarn.lock
  Resolve app/workers/repository_import_worker.rb
  Resolve app/services/search/global_service.rb
  Resolve app/views/projects/tree/show.html.haml
  Resolve app/views/projects/tree/_tree_header.html.haml
  Resolve app/views/projects/tree/_tree_content.html.haml
  Resolve app/models/user.rb
  Resolve app/controllers/autocomplete_controller.rb
  ...
parents e3e81275 b302ddfb
No related merge requests found
Showing
with 115 additions and 45 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment