An error occurred fetching the project authors.
  1. 24 Jan, 2014 2 commits
  2. 23 Jan, 2014 1 commit
  3. 22 Jan, 2014 3 commits
  4. 14 Jan, 2014 1 commit
  5. 13 Jan, 2014 1 commit
  6. 13 Dec, 2013 1 commit
  7. 12 Dec, 2013 2 commits
  8. 07 Oct, 2013 1 commit
  9. 01 Oct, 2013 1 commit
  10. 09 Sep, 2013 1 commit
  11. 25 Aug, 2013 1 commit
    • ash wilson's avatar
      Link issues from comments and automatically close them · c8a115c0
      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.
      c8a115c0
  12. 21 Aug, 2013 2 commits
  13. 19 Aug, 2013 1 commit
  14. 08 Aug, 2013 2 commits
  15. 05 Aug, 2013 1 commit
  16. 18 Jul, 2013 5 commits
    • Izaak Alpert's avatar
      Style changes from review with @randx · d9959427
      Izaak Alpert authored
      -Some changes around calling origional methods for !for_fork? merge requests. Other changes to follow
      
      Change-Id: I009c716ce2475b9efa3fd07aee9215fca7a1c150
      d9959427
    • Izaak Alpert's avatar
      MR on fork: Email fixes, style fixes · 0ef055a4
      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
      0ef055a4
    • Izaak Alpert's avatar
      Rebase on master · 09112dbb
      Izaak Alpert authored
      Trying to retrigger travis
      Change-Id: Ifd86fb4c6b2791ad176230254fbf69a9ade979fb
      09112dbb
    • Izaak Alpert's avatar
      MR on fork: Some cleanup, test updates · 5d56da6b
      Izaak Alpert authored
      -The forked merge request test now tests it's componenets again, and seems to work every time (did this by reordering the branch updates so their is more time for update_branches to run) -- this could still technically fail, but after several runs it doesn't seem to.
      -Removed todo in merge_request, pushed wrapping of grit down to the satellite
      -updated action test to check flock status, made it nolonger pending
      -moved all logging on failure to helper method in satellite
      GITLAB-592
      
      Change-Id: If0554ca35eedc3d3e8461f7d93d4b3939fa2cd75
      5d56da6b
    • Izaak Alpert's avatar
      Merge Request on forked projects · 3d7194f0
      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
      3d7194f0
  17. 08 Jul, 2013 1 commit
  18. 19 Jun, 2013 1 commit
  19. 14 Jun, 2013 3 commits
  20. 22 May, 2013 2 commits
  21. 15 Apr, 2013 1 commit
  22. 02 Apr, 2013 3 commits
  23. 31 Mar, 2013 2 commits
  24. 15 Mar, 2013 1 commit