1. 24 Sep, 2016 4 commits
    • Ruben Davila's avatar
      Fix CHANGELOG. · 8e15ded1
      Ruben Davila authored
      8e15ded1
    • Fatih Acet's avatar
      Merge branch 'gitlab-ce-milestone-tab-badges' into 'master' · 513629f3
      Fatih Acet authored
      Milestone tab badges
      
      ### What does this MR do?
      Adds count badges to the tabs on the Milestone page to mirror the Issue page.
      
      ### Are there points in the code the reviewer needs to double check?
      CSS: Padding was added to the `.milestone` element to make expired milestones look good.
      
      ### Why was this MR needed?
      For consistency with other tabs
      
      ### What are the relevant issue numbers?
      Closes #20114 
      
      ### Screenshots (if relevant)
      
      **Before**
      <img src="/uploads/1f75853a863a9058ee409916b7ee4057/Screen_Shot_2016-07-22_at_13.22.20.png" width="362">
      
      **After**
      <img src="/uploads/8a058290850f571db249dd9b23f5138d/Screen_Shot_2016-07-22_at_13.21.58.png"  width="303">
      
      ![Screen_Shot_2016-08-23_at_1.42.56_AM](/uploads/b072dc6bdf505b2fce46660beaf0eae7/Screen_Shot_2016-08-23_at_1.42.56_AM.png)
      
      ![Screen_Shot_2016-08-23_at_1.43.15_AM](/uploads/e7440bf2aa628aa4dba63863083699c0/Screen_Shot_2016-08-23_at_1.43.15_AM.png)
      
      ### Does this MR meet the acceptance criteria?
      
      - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
      - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
      - [ ] API support added
      - Tests
        - [x] Added for this feature/bug
        - [x] All builds are passing
      - [ ] 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)
      - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
      
      See merge request !5946
      513629f3
    • Fatih Acet's avatar
      Merge branch 'flash-container-z-index' into 'master' · d4007fd4
      Fatih Acet authored
      Removed z-index from flash container
      
      ## What does this MR do?
      
      Fixes a styling bug where the flash container would be above the header when scrolling.
      
      Before it looked like this when scrolling:
      
      ![Screen_Shot_2016-09-08_at_14.06.36](/uploads/d639287329643d26454a997e3917bc53/Screen_Shot_2016-09-08_at_14.06.36.png)
      
      Now it looks like this when scrolling:
      
      ![Screen_Shot_2016-09-08_at_14.07.37](/uploads/7c1c5e38adc9b9011558d4190d3520fe/Screen_Shot_2016-09-08_at_14.07.37.png)
      
      ## Are there points in the code the reviewer needs to double check?
      
      I can't think of any good reason why this would need to be above another element. But you never know!
      
      Closes #20713 
      
      See merge request !6264
      d4007fd4
    • Fatih Acet's avatar
      Merge branch... · a69afc53
      Fatih Acet authored
      Merge branch '22459-tooltips-for-mini-pipeline-graph-in-pipeline-list-use-the-svg-instead-of-container' into 'master'
      
      Fixed pipeline stage svg link tooltip
      
      ## What does this MR do?
      
      Adds `display: block` to the `.stage-container` class which allows the dimensional constraints of the link to be calculated correctly so the `mouseover` events are fired correctly.
      
      ## Are there points in the code the reviewer needs to double check?
      
      ## Why was this MR needed?
      
      Hovering the stage icons to reveal their SVG was buggy and would flash.
      
      ## Screenshots (if relevant)
      
      ![2016-09-23_14.59.17](/uploads/ad4c85fb08f032cc3f5d17749d3f7091/2016-09-23_14.59.17.gif)
      
      I just realised that Gifox actually adds its own mouse that isn't positioned or sized correctly so this doesn't look right, you'll have to `checkout` to confirm.
      
      /cc @dimitrieh I found a con about Gifox! 😆 
      
      ## Does this MR meet the acceptance criteria?
      
      - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
      - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
      - [ ] API support added
      - Tests
        - [ ] Added for this feature/bug
        - [ ] All builds are passing
      - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
      - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
      - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please)
      - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
      
      ## What are the relevant issue numbers?
      
      
      Closes #22459
      
      See merge request !6494
      a69afc53
  2. 23 Sep, 2016 28 commits
  3. 22 Sep, 2016 8 commits