Skip to content
Snippets Groups Projects
  1. Oct 09, 2013
  2. Aug 25, 2013
    • 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
  3. Aug 21, 2013
  4. Aug 05, 2013
  5. Aug 04, 2013
  6. Jul 18, 2013
    • 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
      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
  7. Jun 24, 2013
  8. Jun 19, 2013
  9. Apr 15, 2013
  10. Apr 04, 2013
  11. Mar 31, 2013
  12. Mar 28, 2013
  13. Mar 25, 2013
  14. Mar 17, 2013
  15. Feb 12, 2013
  16. Jan 15, 2013
  17. Jan 05, 2013
  18. Jan 04, 2013
  19. Jan 03, 2013
  20. Dec 18, 2012
  21. Dec 14, 2012
  22. Dec 03, 2012
  23. Dec 01, 2012
  24. Nov 19, 2012
  25. Oct 25, 2012
    • Scott Holden's avatar
      Fix broken Note scopes with lambdas, 4.0 compat · 2335d7b9
      Scott Holden authored
      Without lambdas, Date.today will be evaluated in the class body.
      For it to have a running scope of last week etc, it will need to
      be evaluated each time the scope is called.
      In Rails 4.0, lambdas will be required for all scopes, so not a bad
      idea to go ahead and change them all now.
      2335d7b9
  26. Oct 13, 2012
  27. Oct 10, 2012
  28. Oct 09, 2012
Loading