1. 08 Oct, 2016 4 commits
  2. 07 Oct, 2016 33 commits
  3. 06 Oct, 2016 3 commits
    • Jacob Schatz's avatar
      Merge branch '23025-issue-boards-defaults' into 'master' · 8068d3e1
      Jacob Schatz authored
      Change issue board defaults
      
      #### What does this MR do?
      Changes the issue board default list from `Development`, `Testing`, `Production`, `Ready` to `To Do` and `Doing`
      
      #### Screenshots (if relevant)
      ![Screen_Shot_2016-10-06_at_8.46.48_AM](/uploads/6e73e03f5749f18b95bd7e23c676603d/Screen_Shot_2016-10-06_at_8.46.48_AM.png)
      ![Screen_Shot_2016-10-06_at_9.07.06_AM](/uploads/cadd3af74e3adb73fe854478ce95120e/Screen_Shot_2016-10-06_at_9.07.06_AM.png)
      
      #### What are the relevant issue numbers?
      Closes #23025
      
      See merge request !6716
      8068d3e1
    • Annabel Dunstone Gray's avatar
      Update issue board spec · 35e231b5
      Annabel Dunstone Gray authored
      35e231b5
    • Fatih Acet's avatar
      Merge branch 'fix-already-selected-activity-link' into 'master' · a625757c
      Fatih Acet authored
      Fix inconsistent highlighting of already selected activity nav-links
      
      ## What does this MR do?
      
      *  Remove edge case where user could deselect an activity nav-link (which seems to be returning all the events)
      *  Explicitly add an `All` tab to return all the events
      
      ## Are there points in the code the reviewer needs to double check?
      Shouldn't be
      
      ## Why was this MR needed?
      Resolves existing UI inconsistency
      
      ## Screenshots (if relevant)
      Before:
      ![4OzkoQVJYc](/uploads/fd2a7fdbde2159e875482ec7b828fe60/4OzkoQVJYc.gif)
      
      After:
      ![E0lj8UhEUU](/uploads/7eb5155861eb79d72957de04c9f172c9/E0lj8UhEUU.gif)
      
      ## 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 [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 #21631
      *  Closes #21452
      
      
      See merge request !6091
      a625757c