Skip to content
Snippets Groups Projects
Commit fb51734f authored by Filipa Lacerda's avatar Filipa Lacerda
Browse files

[ci skip] Merge branch 'master' into 5845-extract-ee-environments-files

* master: (140 commits)
  Resolve conflicts in app/views/admin/dashboard/index.html.haml
  Resolve conflicts in app/controllers/admin/dashboard_controller.rb
  Resolve conflict in LICENSE
  fixed copy to cliboard button in embedded snippets
  Migrates EE-only js components to single file components
  Use less aggressive sticking for DB load balancing
  Fix Error 500 viewing admin page due to statement timeouts
  Fix Error 500 viewing admin page due to statement timeouts
  Grant privileges after database is created
  Only setup db in the first checkout!
  Add a CI job to test ce-upgrade-ee migration path
  resolve conflicts in locale/gitlab.pot
  resolve conflicts in app/views/layouts/nav/sidebar/_project.html.haml
  Project Sidebar: Split CI/CD into CI/CD and Operations
  Fix GPM content types for Doorkeeper
  Remove docker pull prefix from registry clipboard feature
  Port of gitlab-ce!18941
  Add contact sales option for Epics
  Remove unnecessary section-100 css class from application_row.vue
  Resolve other conflicts in locale/gitlab.pot
  ...
parents d41f6cad ace6b918
No related merge requests found
Showing
with 397 additions and 302 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