1. 19 Jan, 2014 1 commit
  2. 06 Jan, 2014 1 commit
  3. 25 Dec, 2013 1 commit
  4. 13 Dec, 2013 1 commit
  5. 28 Nov, 2013 1 commit
  6. 01 Oct, 2013 1 commit
  7. 25 Aug, 2013 1 commit
    • ash wilson's avatar
      Link issues from comments and automatically close them · af4b092d21a1
      ash wilson authored
      Any mention of Issues, MergeRequests, or Commits via GitLab-flavored markdown
      references in descriptions, titles, or attached Notes creates a back-reference
      Note that links to the original referencer. Furthermore, pushing commits with
      commit messages that match a (configurable) regexp to a project's default
      branch will close any issues mentioned by GFM in the matched closing phrase.
      If accepting a merge request would close any Issues in this way, a banner is
      appended to the merge request's main panel to indicate this.
      af4b092d21a1
  8. 21 Aug, 2013 1 commit
  9. 05 Aug, 2013 1 commit
  10. 04 Aug, 2013 3 commits
  11. 18 Jul, 2013 3 commits
    • Izaak Alpert's avatar
      Style changes from review with @randx · fb3ca7b97aa6
      Izaak Alpert authored
      -Some changes around calling origional methods for !for_fork? merge requests. Other changes to follow
      
      Change-Id: I009c716ce2475b9efa3fd07aee9215fca7a1c150
      fb3ca7b97aa6
    • Izaak Alpert's avatar
      MR on fork: Email fixes, style fixes · e16520773d49
      Izaak Alpert authored
      -Removed many extra spaces I added
      -Fixed email templates to be consistent/better looking
      
      GITLAB-894, GITLAB-895, (GITLAB-858)
      
      Change-Id: I35c1a8e0e22af7de26d54e5c3da987fa7bb3921e
      e16520773d49
    • Izaak Alpert's avatar
      Merge Request on forked projects · b4f243f95099
      Izaak Alpert authored
      The good:
      
       - You can do a merge request for a forked commit and it will merge properly (i.e. it does work).
       - Push events take into account merge requests on forked projects
       - Tests around merge_actions now present, spinach, and other rspec tests
       - Satellites now clean themselves up rather then recreate
      
      The questionable:
      
       - Events only know about target projects
       - Project's merge requests only hold on to MR's where they are the target
       - All operations performed in the satellite
      
      The bad:
      
        -  Duplication between project's repositories and satellites (e.g. commits_between)
      
      (for reference: http://feedback.gitlab.com/forums/176466-general/suggestions/3456722-merge-requests-between-projects-repos)
      
      Fixes:
      
      Make test repos/satellites only create when needed
      -Spinach/Rspec now only initialize test directory, and setup stubs (things that are relatively cheap)
      -project_with_code, source_project_with_code, and target_project_with_code now create/destroy their repos individually
      -fixed remote removal
      -How to merge renders properly
      -Update emails to show project/branches
      -Edit MR doesn't set target branch
      -Fix some failures on editing/creating merge requests, added a test
      -Added back a test around merge request observer
      -Clean up project_transfer_spec, Remove duplicate enable/disable observers
      -Ensure satellite lock files are cleaned up, Attempted to add some testing around these as well
      -Signifant speed ups for tests
      -Update formatting ordering in notes_on_merge_requests
      -Remove wiki schema update
      Fixes for search/search results
      -Search results was using by_project for a list of projects, updated this to use in_projects
      -updated search results to reference the correct (target) project
      -udpated search results to print both sides of the merge request
      
      Change-Id: I19407990a0950945cc95d62089cbcc6262dab1a8
      b4f243f95099
  12. 24 Jun, 2013 1 commit
  13. 19 Jun, 2013 1 commit
  14. 15 Apr, 2013 1 commit
  15. 04 Apr, 2013 2 commits
  16. 31 Mar, 2013 2 commits
  17. 28 Mar, 2013 1 commit
  18. 25 Mar, 2013 1 commit
  19. 17 Mar, 2013 1 commit
  20. 12 Feb, 2013 1 commit
  21. 15 Jan, 2013 1 commit
  22. 05 Jan, 2013 1 commit
  23. 04 Jan, 2013 1 commit
  24. 03 Jan, 2013 1 commit
  25. 18 Dec, 2012 1 commit
  26. 14 Dec, 2012 1 commit
  27. 03 Dec, 2012 6 commits
  28. 01 Dec, 2012 1 commit
  29. 19 Nov, 2012 1 commit