1. 24 Jun, 2016 3 commits
  2. 23 Jun, 2016 3 commits
  3. 22 Jun, 2016 3 commits
  4. 21 Jun, 2016 6 commits
  5. 20 Jun, 2016 4 commits
    • Grzegorz Bizon's avatar
      Merge branch 'master' into refactor/ci-config-add-entry-error · 9510d31b
      Grzegorz Bizon authored
      * master: (345 commits)
        use rails root join
        fixed a couple of errors spotted in production
        Fix RangeError exceptions when referring to issues or merge requests outside of max database values
        Fix bug in `WikiLinkFilter`.
        Small frontend code fixes and restore 8a2d88f commit
        Warn about admin privilege to disable GitHub Webhooks
        Listing GH Webhooks doesn't stop import process for non GH admin users
        fixup! updated docs for api endpoint award emoji
        Update CHANGELOG
        Ensure Todos counters doesn't count Todos for projects pending delete
        Add endpoints for award emoji on notes
        Sort API endpoints and implement feedback
        Add endpoints for Award Emoji
        Fixed issue with assignee dropdown not selecting correctly
        Removed update method Re-structured controller spec Renamed issuable param to issuable_id
        Fix clibpoard buttons on "Check out branch" modal.
        Track method call times/counts as a single metric
        Cache todo counters (pending/done)
        Fix a 'wrong number of arguments' error
        Added missing mount point for Sidekiq Metrics API, after it got lost on rebase.
        ...
      9510d31b
    • Rémy Coutable's avatar
      Merge branch 'fix/import-export-prod' into 'master' · 44b8b77e
      Rémy Coutable authored
      Fixed a couple of errors on import/export spotted in production
      
      Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/18828 and https://gitlab.com/gitlab-org/gitlab-ce/issues/18829
      
      A couple of tiny bugs spotted after deploying in prod
      
      See merge request !4782
      44b8b77e
    • James Lopez's avatar
      use rails root join · d5b3a266
      James Lopez authored
      d5b3a266
    • James Lopez's avatar
      cee2a2dc
  6. 18 Jun, 2016 16 commits
  7. 17 Jun, 2016 5 commits
    • Douwe Maan's avatar
      Merge branch 'issue_12758' into 'master' · 00906b5b
      Douwe Maan authored
      Implement custom notification level options
      
      ![Screen_Shot_2016-06-17_at_15.31.43](/uploads/3fc47d2f461b3e8b67bb8acaa304cf99/Screen_Shot_2016-06-17_at_15.31.43.png)
      
      ![Screenshot_from_2016-06-15_10-52-27](/uploads/88dbdd21d97e80ee772fe08fa0c9b393/Screenshot_from_2016-06-15_10-52-27.png)
      
      part of #12758 
      
      See merge request !4389
      00906b5b
    • Felipe Artur's avatar
      4b204f07
    • Douwe Maan's avatar
      Merge branch 'fix-18717' into 'master' · 33d8972b
      Douwe Maan authored
      Ensure that group owner cannot request access to a project of their group
      
      ## What does this MR do?
      
      It fixes two things:
      
      - 91ad995d69e1a0f8991fd896f1d9febc109273fe Ensure that group owner cannot request access to a project of their group
      - ec3ff061148d556757e7cd486cdc6083d77acf34 Ensure group/project owners can see their members' access_level (see the commit message for details)
      
      ## Are there points in the code the reviewer needs to double check?
      
      Not really, these are pretty simple fixes.
      
      ## Why was this MR needed?
      
      Because there was an issue created!
      
      ## What are the relevant issue numbers?
      
      Fixes #18717.
      
      ## Does this MR meet the acceptance criteria?
      
      - [x] CHANGELOG is not needed since the bug is only present in a 8.9 RC
      - [x] Tests
        - [x] Added for this feature/bug
        - [x] All builds are passing
      - [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)
      
      See merge request !4729
      33d8972b
    • Douwe Maan's avatar
      Merge branch 'issuable-todo-improvements' · b218e82b
      Douwe Maan authored
      # Conflicts:
      #	app/controllers/projects/todos_controller.rb
      b218e82b
    • Robert Speicher's avatar
      Merge branch 'gh-webhooks' into 'master' · 5ef749b7
      Robert Speicher authored
      Avoid that GitHub import fails when retrieving Webhooks for non GitHub admins
      
      Closes #18729 
      
      See merge request !4723
      5ef749b7