1. 01 Sep, 2016 1 commit
  2. 30 Aug, 2016 3 commits
    • Sean McGivern's avatar
      Use Repository#fetch_ref · 73c355549c17
      Sean McGivern authored
      73c355549c17
    • Katarzyna Kobierska's avatar
      User can edit closed MR with deleted fork · 6452439e355d
      Katarzyna Kobierska authored
      Add test for closed MR without fork
      
      Add view test visibility of Reopen and Close buttons
      
      Fix controller tests and validation method
      
      Fix missing space
      
      Remove unused variables from test
      
      closed_without_fork? method refactoring
      
      Add information about missing fork
      
      When closed MR without fork can't edit target branch
      
      Tests for closed MR edit view
      
      Fix indentation and rebase, refactoring
      6452439e355d
    • Sean McGivern's avatar
      Fix resolving conflicts on forks · 1096ef141949
      Sean McGivern authored
      Forks may not be up-to-date with the target project, and so might not
      contain one of the parent refs in their repo. Fetch this if it isn't
      present.
      1096ef141949
  3. 17 Aug, 2016 1 commit
  4. 16 Aug, 2016 1 commit
  5. 15 Aug, 2016 2 commits
  6. 12 Aug, 2016 4 commits
  7. 11 Aug, 2016 1 commit
    • Scott Le's avatar
      api for generating new merge request · 66cfe8b09cec
      Scott Le authored
      DRY code + fix rubocop
      
      Add more test cases
      
      Append to changelog
      
      DRY changes list
      
      find_url service for merge_requests
      
      use GET for getting merge request links
      
      remove files
      
      rename to get_url_service
      
      reduce loop
      
      add test case for cross project
      
      refactor tiny thing
      
      update changelog
      66cfe8b09cec
  8. 03 Aug, 2016 4 commits
  9. 02 Aug, 2016 2 commits
  10. 01 Aug, 2016 1 commit
  11. 29 Jul, 2016 3 commits
  12. 18 Jul, 2016 1 commit
  13. 13 Jul, 2016 3 commits
  14. 08 Jul, 2016 1 commit
  15. 06 Jul, 2016 3 commits
  16. 04 Jul, 2016 1 commit
  17. 01 Jul, 2016 1 commit
  18. 21 Jun, 2016 1 commit
    • Sean McGivern's avatar
      Fix auto-MR-close text from branch name · 9c1300b775ba
      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"
      9c1300b775ba
  19. 03 Jun, 2016 3 commits
  20. 02 Jun, 2016 1 commit
  21. 20 May, 2016 1 commit
  22. 17 May, 2016 1 commit
    • Sean McGivern's avatar
      Create a todo on failing MR build · aee97853446d
      Sean McGivern authored
      When a build fails for a commit, create a todo for the author of the
      merge request that commit is the HEAD of. If the commit isn't the HEAD
      commit of any MR, don't do anything. If there already is a todo for that
      user and MR, don't do anything.
      
      Current limitations:
      - This isn't configurable by project.
      - The author of a merge request might not be the person who pushed the
        breaking commit.
      aee97853446d