24 Mar, 2014

1 commit


03 Mar, 2014

1 commit

  • When an email notification concerns a specific object (issue, note,
    merge request, etc.), add a link to the footer of the email that opens
    the item's page in a web browser.
    
    Rationale:
    
    * The link is predictable: always the same text, always at the same
    location, like any reliable tool.
    
    * It allows to remove the inline-title in many emails, and leave only
    the actual content of the message.
    Pierre de La Morinerie
     

19 Feb, 2014

3 commits

  • This changes the email "From" field from "gitlab@example.com" to either:
    
    * "John Doe <gitlab@example.com>" if the author of the action is known,
    * "GitLab <gitlab@example.com>" otherwise.
    
    Rationale: this allow mails to appear as if they were sent by the
    author. It appears in the mailbox more like a real discussion between
    the sender and the receiver ("John sent: we should refactor this") and
    less like a robot notifying about something.
    Pierre de La Morinerie
     
  • This changes the email subjects for issues and merge request
    notifications from:
    
        Team / Project | Note for issue #1234
    
    to:
    
        Team / Project | Saving issue doesn't work sometimes (#1234)
    
    Rationale:
    
    * Scan the subject of the email notification more easily when catching
    up with a lot of notifications. Instead of having to open the email to
    get the title of the issue or merge request, one can simply read the
    subject of the email.
    
    * Group messages by subject: email clients will group emails in threads
    if they have the same subject.
    Pierre de La Morinerie
     
  • This changes email subjects from:
    
        GitLab | Team / Project | Note for issue #1234
    
    to:
    
        Team / Project | Note for issue #1234
    
    Rationale:
    
    * Emails should be as meaningful as possible, and emphasize content over
    chrome. The "GitLab" name is more chrome than content.
    
    * Users can tell an email coming from GitLab by the sender or the header
    in the email content.
    
    * An organization that works mainly with GitLab knows that
    every SVC email comes from GitLab. For these organizations, having
    "GitLab" in front of every email is just noise hiding the meaningful
    information.
    Pierre de La Morinerie
     

19 Jan, 2014

1 commit


16 Dec, 2013

1 commit


08 Nov, 2013

1 commit

  • 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. :)
    Drew Blessing
     

22 Aug, 2013

1 commit


17 Jul, 2013

3 commits

  • 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
    Izaak Alpert
     
  • -Some changes around calling origional methods for !for_fork? merge requests. Other changes to follow
    
    Change-Id: I009c716ce2475b9efa3fd07aee9215fca7a1c150
    Izaak Alpert
     
  • 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
    Izaak Alpert
     

01 Jul, 2013

1 commit


28 Mar, 2013

2 commits


19 Mar, 2013

1 commit