Skip to content
Snippets Groups Projects
  1. Feb 14, 2018
  2. Feb 13, 2018
  3. Feb 02, 2018
  4. Jan 10, 2018
  5. Jan 09, 2018
  6. Dec 05, 2017
    • Jan Provaznik's avatar
      Create merge request from email · 8cce7073
      Jan Provaznik authored
      * new merge request can be created by sending an email to the specific
      email address (similar to creating issues by email)
      * for the first iteration, source branch must be specified in the mail
      subject, other merge request parameters can not be set yet
      * user should enable "Receive notifications about your own activity" in
      user settings to receive a notification about created merge request
      
      Part of #32878
      8cce7073
  7. Nov 28, 2017
    • Sean McGivern's avatar
      Ensure MRs always use branch refs for comparison · 3c6a4d63
      Sean McGivern authored
      If a merge request was created with a branch name that also matched a tag name,
      we'd generate a comparison to or from the tag respectively, rather than the
      branch. Merging would still use the branch, of course.
      
      To avoid this, ensure that when we get the branch heads, we prepend the
      reference prefix for branches, which will ensure that we generate the correct
      comparison.
      3c6a4d63
  8. Nov 25, 2017
  9. Nov 16, 2017
  10. Apr 26, 2017
  11. Apr 06, 2017
  12. Mar 17, 2017
  13. Feb 21, 2017
  14. Jan 31, 2017
    • Rydkin Maxim's avatar
      refactor merge request build service · 14326c88
      Rydkin Maxim authored
      add changelog entry
      
      replace local variables `merge_request` with instance ones
      
      modify `MergeRequests::BuildService` to fix failed tests
      
      extract `assign_target_project` method
      
      remove unnecessary instance variables
      
      remove exclamation marks and rewrite conditionals to improve readability
      
      extract `params_does_not_contain_branches?` method, rename `unprepared_merge_request` method to `uncreatable_merge_request`
      
      replace instance variables `merge_request` and `error_messages` with getters and setters; divide `set_title_and_description` method on two separate ones
      
      refactor `execute` method
      
      return `set_title_and_description` method
      
      rename `branches_selected?` method to `branches_present?` to make it more different from `branches_specified?`
      
      fixes after discussion
      
      renamed method branches_valid?
      
      fix space
      
      return assigning methods into `execute` method
      
      simplify `find_target_branch` and `find_source_project` methods
      
      fix spec `merge request issuable record that supports slash commands in its description and notes`
      14326c88
  15. Dec 16, 2016
  16. Dec 08, 2016
  17. Nov 29, 2016
  18. Nov 19, 2016
    • Alex Sanford's avatar
      Fix regression in Merge request form · 16a8d644
      Alex Sanford authored
      Merge request !7163 caused an error message to appear on the Merge
      Request form when it was first loaded by the user. This commit fixes
      that regression bug.
      16a8d644
  19. Nov 01, 2016
  20. Oct 11, 2016
  21. Sep 01, 2016
  22. Aug 03, 2016
  23. Jun 21, 2016
    • Sean McGivern's avatar
      Fix auto-MR-close text from branch name · b2f60bb9
      Sean McGivern authored
      Rails's form helpers use the `$attr_before_type_cast` method where
      available, and this value only appears to be updated on assignment, not
      when the object is mutated in some other way:
      
          [1] pry(main)> mr = MergeRequest.new
          => #<MergeRequest:0x007fcf28395d88 ...>
          [2] pry(main)> mr.description = 'foo'
          => "foo"
          [3] pry(main)> mr.description << ' bar'
          => "foo bar"
          [4] pry(main)> mr.description
          => "foo bar"
          [5] pry(main)> mr.description_before_type_cast
          => "foo"
          [6] pry(main)> mr.description += ' bar'
          => "foo bar bar"
          [7] pry(main)> mr.description_before_type_cast
          => "foo bar bar"
      b2f60bb9
  24. Jun 03, 2016
  25. May 13, 2016
  26. May 06, 2016
  27. Apr 25, 2016
  28. Apr 14, 2016
  29. Mar 18, 2016
    • Zeger-Jan van de Weg's avatar
      \#to_branch_name now uses the iid as postfix · 70ca3370
      Zeger-Jan van de Weg authored
      Given the branch name 'mep-mep' with an iid being 1,
      the current way, master's way, would yield a branch name of
      1-mep-mep. The problem for larger projects however would be that
      a developer might forget what iid the issue was.
      
      When this developer would try to tab complete it would:
      - Or result in 20+ branches possibly
      - Or start with the wrong digit, try again with digit++
        - Would see 20 branches, repeat
      
      Thus the obvious way of solving this is letting the dev tab complete
      on the issue title, which is easier to remember.
      70ca3370
  30. Mar 15, 2016
  31. Mar 03, 2016
  32. Feb 19, 2016
  33. Aug 11, 2015
  34. Aug 05, 2015
  35. Jul 15, 2015
Loading