Skip to content
Snippets Groups Projects
  1. Dec 27, 2019
  2. Nov 19, 2019
  3. Nov 15, 2019
  4. Nov 08, 2019
  5. Oct 22, 2019
  6. Sep 18, 2019
  7. Sep 13, 2019
  8. Sep 11, 2019
    • Filipa Lacerda's avatar
      Enables Run Pipeline button to be rendered · 48b98b58
      Filipa Lacerda authored
      In the Merge Request view, under pipelines tab
      the user can see a run pipeline button
      
      Adds axios post request to button click
      
      Adds the logic to handle the user click,
      refresh the table and disable the button while thee
      request is being made
      
      Updates UI for desktop and mobile
      
      Adds specs
      Regenerates potfile
      
      Follow-up after review
      
      Uses .finally to avoid code repetition
      48b98b58
  9. Jul 04, 2019
    • Nick Thomas's avatar
      Allow asynchronous rebase operations to be monitored · 381468d0
      Nick Thomas authored
      This MR introduces tracking of the `rebase_jid` for merge requests. As
      with `merge_ongoing?`, `rebase_in_progress?` will now return true if a
      rebase is proceeding in sidekiq.
      
      After one release, we should remove the Gitaly-based lookup of rebases.
      It is much better to track this kind of thing via the database.
      Verified
      381468d0
  10. Jun 20, 2019
    • Oswaldo Ferreir's avatar
      Automatically update MR merge-ref along merge status · 3af348b6
      Oswaldo Ferreir authored
      This couples the code that transitions the `MergeRequest#merge_status`
      and refs/merge-requests/:iid/merge ref update.
      
      In general, instead of directly telling `MergeToRefService` to update
      the merge ref, we should rely on `MergeabilityCheckService` to keep
      both the merge status and merge ref synced. Now, if the merge_status is
      `can_be_merged` it means the merge-ref is also updated to the latest.
      
      We've also updated the logic to be more systematic and less user-based.
      3af348b6
  11. Jun 18, 2019
  12. Jun 11, 2019
  13. Jun 03, 2019
    • Shinya Maeda's avatar
      Abstract auto merge processes · d4b46936
      Shinya Maeda authored
      We have one auto merge strategy today - Merge When Pipeline
      Succeeds.
      
      In order to add more strategies for Merge Train feature,
      we abstract the architecture to be more extensible.
      
      Removed arguments
      
      Fix spec
      d4b46936
  14. May 31, 2019
    • Oswaldo Ferreir's avatar
      Add payload to the service response · 4246a621
      Oswaldo Ferreir authored
      This introduces payload to the ServiceResponse with
      the merge ref HEAD commit data
      4246a621
    • Oswaldo Ferreir's avatar
      Simplify merge_ref_head methods · 96db70a4
      Oswaldo Ferreir authored
      96db70a4
    • Oswaldo Ferreir's avatar
      Automatically update MR merge-ref along merge status · b965009d
      Oswaldo Ferreir authored
      This couples the code that transitions the `MergeRequest#merge_status`
      and refs/merge-requests/:iid/merge ref update.
      
      In general, instead of directly telling `MergeToRefService` to update
      the merge ref, we should rely on `MergeabilityCheckService` to keep
      both the merge status and merge ref synced. Now, if the merge_status is
      `can_be_merged` it means the merge-ref is also updated to the latest.
      
      We've also updated the logic to be more systematic and less user-based.
      b965009d
  15. May 20, 2019
  16. May 07, 2019
  17. Apr 15, 2019
  18. Apr 08, 2019
  19. Apr 05, 2019
    • Paul Slaughter's avatar
      Fix IDE detecting MR from fork branch · 59ac0924
      Paul Slaughter authored
      **Why?**
      Currently the IDE loads a merge request based on only the
      `source_branch` name. This means it loads MR's from
      forks that have the same branch name (not good).
      
      - This required updating the BE API to accept `source_project_id`
      59ac0924
  20. Mar 07, 2019
  21. Mar 06, 2019
  22. Feb 26, 2019
  23. Feb 25, 2019
  24. Feb 16, 2019
  25. Feb 06, 2019
  26. Feb 05, 2019
  27. Jan 22, 2019
  28. Jan 14, 2019
  29. Nov 28, 2018
  30. Nov 27, 2018
  31. Nov 05, 2018
  32. Oct 26, 2018
Loading