• Filipa Lacerda's avatar
    Merge branch 'master' into ee-fl-mr-widget-components · 670601c0
    Filipa Lacerda authored
    * master: (76 commits)
      Add changelog entry
      Include mock replication slot WAL
      Hide sync status when event timestamp is not present
      Show empty state when timestamp is not present
      Update common.rb
      Merge branch 'qa-secret-variables-scenario' into tmp
      Just don't expand if it's already expanded
      Use `numberToHumanSize` for memory unit conversion
      Add multiple steps to limitations.
      Resolve scripts/lint-rugged conflicts
      fix bug in webpack_helper in which force_same_domain argument was ignored breaking local rspec tests
      Merge branch 'sh-fix-geo-migration-path' into 'master'
      Fix rubocop offenses introduced in !16623
      Fix spec/ee/spec/lib/gitlab/geo/health_check_spec.rb
      fix documentation about node version
      Ensure the  job also run for tags
      Fix broken paths
      Fix conflicts for app/assets/javascripts/vue_merge_request_widget/dependencies.js
      Fix conflicts for app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.vue
      Fix conflicts for app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_closed.vue
      ...
    670601c0
dependencies.js 3.48 KB