1. 02 Oct, 2016 7 commits
    • Annabel Dunstone Gray's avatar
      Merge branch 'fix-issue-title-wrap' into 'master' · 77f832d8
      Annabel Dunstone Gray authored
      Add word-wrap to issue title on issue and milestone boards
      
      ## What does this MR do?
      Adds word-wrap to the issue title found on the issue board and the milestone boards
      
      ## Are there points in the code the reviewer needs to double check?
      Shouldn't be
      
      ## Why was this MR needed?
      Improves UI
      
      ## Screenshots (if relevant)
      Before:
      ![Screen_Shot_2016-09-19_at_10.19.18_AM](/uploads/7b79fe87c12c0d9a89fff5c725c546a4/Screen_Shot_2016-09-19_at_10.19.18_AM.png)
      ![Screen_Shot_2016-09-19_at_10.19.14_AM](/uploads/80a7e37433c98a406806249f01fe72fd/Screen_Shot_2016-09-19_at_10.19.14_AM.png)
      
      
      After:
      ![Screen_Shot_2016-09-19_at_10.18.54_AM](/uploads/e3a9420262a5d521478bea5601afafab/Screen_Shot_2016-09-19_at_10.18.54_AM.png)
      ![Screen_Shot_2016-09-19_at_10.19.04_AM](/uploads/b87d661bd1492777c4f677ea3ed09dcc/Screen_Shot_2016-09-19_at_10.19.04_AM.png)
      
      
      ## Does this MR meet the acceptance criteria?
      
      - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
      - Tests
        - [x] All builds are passing
      - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
      - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
      - [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
      - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
      
      ## What are the relevant issue numbers?
      Closes #22274
      
      See merge request !6412
      77f832d8
    • 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
    • Clement Ho's avatar
      0968a29f
  2. 01 Oct, 2016 7 commits
  3. 30 Sep, 2016 26 commits