• Grzegorz Bizon's avatar
    Merge branch 'master' into fix/rename-mwbs-to-merge-when-pipeline-succeeds · 895d97af
    Grzegorz Bizon authored
    * master: (312 commits)
      Fix bad selection on dropdown menu for tags filter
      Fixed issue boards scrolling with a lot of lists & issues
      You can only assign default_branch when editing a project ...
      Don't convert data which already is the target type
      Stop supporting Google and Azure as backup strategies
      renames some of the specs and adds changelog entry
      Fixed dragging issue moving wrong issue after multiple drags of issue
      Fixed issue boards issue sorting when dragging issue into list
      Rephrase some system notes to be compatible with new system note style
      Add missing JIRA file that redirects to the new location
      Fix documentation to create the `pg_trm` extension before creating the DB
      Document that we always use `do...end` for `before` in RSpec
      Backport Note#commands_changes from EE
      Log mv_namespace parameters
      Add default_branch attr to Project API payload in docs.
      Fix title case to sentence case
      properly escape username validation error message flash
      Remove header ids from University docs
      Add missing documentation.
      Added test that checks the correct select box is there for the LFS ...
      ...
    
    Conflicts:
    	app/services/system_note_service.rb
    	spec/features/merge_requests/merge_when_pipeline_succeeds_spec.rb
    	spec/services/merge_requests/merge_when_pipeline_succeeds_service_spec.rb
    	spec/services/system_note_service_spec.rb
    895d97af
merge_when_pipeline_succeeds_spec.rb 3.39 KB