1. 02 Oct, 2016 5 commits
    • Robert Speicher's avatar
    • Robert Speicher's avatar
      Merge branch... · 9dd50b57
      Robert Speicher authored
      Merge branch 'jimmykarily/gitlab-ce-notify_current_user_when_merging_an_mr_after_build_succeeds' into 'master'
      
      Notify current_user about automatic merge after successful build
      
      It enables notifications to the initiator of a merge when the MR is flagged as "Merge when build succeeds".
      
      Because when running Builds, quite some time passes between the user's
      action and the actual Merge so it is a good thing to notify the
      initiator of the Merge when it actually happens.
      
      Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14409
      
      See merge request !6534
      9dd50b57
    • Robert Speicher's avatar
      Merge branch... · e64594ac
      Robert Speicher authored
      Merge branch '21983-member-add_user-doesn-t-detect-existing-members-that-have-requested-access' into 'master'
      
      Resolve "`Member.add_user`doesn't detect existing members that have requested access"
      
      ## What does this MR do?
      
      This merge request handle the case when an access requester is added to a group or project (via the members page or the API).
      
      In `Member.add_user`, if an access requester already exists, we simply accept their request (and set the `created_by`, `access_level` and `expires_at` attributes if given).
      
      ## Are there points in the code the reviewer needs to double check?
      
      I've taken the opportunity to cleanup the whole `{Group,Project}Member.add_user*` methods since it was quite a mess.
      
      ## What are the relevant issue numbers?
      
      Closes #21983
      
      See merge request !6393
      e64594ac
    • Robert Speicher's avatar
      Merge branch 'rc-new-members-request-access-service' into 'master' · 076e0406
      Robert Speicher authored
      New `Members::RequestAccessService`
      
      Part of #21979.
      
      See merge request !6265
      076e0406
    • Robert Speicher's avatar
      Merge branch 'sort-within-labels' into 'master' · c9352aa6
      Robert Speicher authored
      Preserve label filters when sorting
      
      ## What does this MR do?
      
      Allows Issues that are already filtered by labels to be sorted without losing the label filters.
      
      ## Why was this MR needed?
      
      Users don't expect to lose their label filters when sorting Issues.
      
      ## What are the relevant issue numbers?
      
      Closes #20982
      
      See merge request !6136
      c9352aa6
  2. 01 Oct, 2016 7 commits
  3. 30 Sep, 2016 28 commits