BigW Consortium Gitlab

  1. 08 Nov, 2013 2 commits
    • Fix minor errors/annoyances in email templates · 57ad81a9
      Drew Blessing authored
      There was some funny syntax in merge request email templates. There was a ! before
      the merge request number when there probably should be a #. This may be some carry over
      from markdown but should not be in email templates.  There were also some capitalization
      discrepancies among the subject lines. For those OCD people out there I standardized the
      capitalization. :)
    • Improve message in email notifications · 54e65c11
      David Pursehouse authored
  2. 11 Sep, 2013 1 commit
  3. 30 Aug, 2013 1 commit
  4. 20 Aug, 2013 1 commit
  5. 04 Aug, 2013 2 commits
  6. 18 Jul, 2013 4 commits
    • Revert note.project references back to @project · 532809a1
      Izaak Alpert authored
      -removed extranious space from new_merge_request_email.text.erb
      
      Change-Id: I65314b3fe8f8442b4c30d311b96fbceddf240f42
    • Update emails to describe path using for_fork? · 539c70c7
      Izaak Alpert authored
      Forked MR's will print
      
      Project:Branch <source_project_with_path>:<source_branch> -> <target_project_with_path>:<target_branch>
      
      Non forked MR's will print
      
      Branch <source_branch> -> <target_branch>
      
      Change-Id: I89399aec2e7fde8e4b64b110a48099a95ae4f038
    • 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
    • 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
  7. 01 Jul, 2013 1 commit
  8. 24 Jun, 2013 1 commit
  9. 13 Jun, 2013 1 commit
  10. 29 May, 2013 1 commit
  11. 28 May, 2013 1 commit
  12. 16 May, 2013 1 commit
  13. 10 May, 2013 1 commit
  14. 10 Apr, 2013 1 commit
  15. 28 Mar, 2013 4 commits
  16. 19 Mar, 2013 2 commits
  17. 12 Mar, 2013 2 commits
  18. 28 Feb, 2013 2 commits
  19. 18 Jan, 2013 1 commit
  20. 31 Dec, 2012 2 commits
  21. 28 Dec, 2012 1 commit
  22. 20 Dec, 2012 3 commits
  23. 29 Nov, 2012 1 commit
  24. 09 Nov, 2012 1 commit
  25. 14 Oct, 2012 1 commit
  26. 06 Sep, 2012 1 commit