1. 01 Oct, 2016 4 commits
    • Fatih Acet's avatar
      Merge branch '22221-tags-are-not-available-from-repository-compare-view' into 'master' · 60b92c55
      Fatih Acet authored
      Changed compare dropdowns to dropdowns with search input
      
      ## What does this MR do?
      
      This changes the compare dropdowns from text inputs, that when clicked, open a dropdown of branches/tags to dropdowns that have a dropdown toggle and an isolated search input.
      
      ## Are there points in the code the reviewer needs to double check?
      
      ## Why was this MR needed?
      
      This was needed to fix the poor UX highlighted in #22221, where opening the dropdown showed an initially filtered set of results because the dropdown toggle was the dropdown filter itself. The compare page is always loaded with `master` as each branch/tag selection, so when opening the dropdown, it would only show results matching `master`.
      
      ## Screenshots (if relevant)
      
      ![2016-09-27_18.28.10](/uploads/0ea1d91cb592c6e140ed62c336e77227/2016-09-27_18.28.10.gif)
      
      ## 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 #22221
      
      See merge request !6550
      60b92c55
    • Fatih Acet's avatar
      Merge branch 'create-mr-banner' into 'master' · fc90db7c
      Fatih Acet authored
      MR banner & flash notices updates
      
      ### What does this MR do?
      * Moves the create MR banner below subnav
      * Changes MR banner background to white
      * Moves flash notices underneath subnav
      * Adds container within flash notices to align with content
      
      Closes #22767 
      ### Why was this MR needed?
      It looked a bit out of place between the two navs & had unneeded spacing.
      
      ### Screenshots (if relevant)
      Before:   
      <img src="/uploads/c1676a1923893a7ba7e1c6d6a50d4ea6/Screen_Shot_2016-09-09_at_7.17.31_PM.png" width="800px">
      After:   
      <img src="/uploads/74a2d6c8c43b9a15cd535a2a7adb2685/Screen_Shot_2016-09-28_at_3.41.29_PM.png" width="800px">
      
      Before:   
      <img src="/uploads/285e3de31326c48de43bb48abd4d907c/Screen_Shot_2016-09-29_at_10.57.55_AM.png" width="800px">
      After:    
      <img src="/uploads/0877e3e45755e5ca36694c52ad2e6198/Screen_Shot_2016-09-29_at_10.56.04_AM.png" width="800px">
      
      With both alert and broadcast message:
      ![Screen_Shot_2016-09-29_at_11.06.51_AM](/uploads/ba3963a73b5c82940533c369ec54ec50/Screen_Shot_2016-09-29_at_11.06.51_AM.png)
      
      
      See merge request !6581
      fc90db7c
    • Jacob Schatz's avatar
      Merge branch 'cs-frontend-guidelines' into 'master' · df100ca2
      Jacob Schatz authored
      Add Frontend Development Guidelines to the Developer Documentation
      
      ## What does this MR do?
      
      WIP incomplete draft of some Frontend Development Guidelines for contributors to the project, new hires, and for other projects and persons to look to for guidance.
      
      These are all subject to removal, modification, etc. If you disagree with any of these, please feel free to voice your concerns :)
      
      ## Why was this MR needed?
      
      There are a number of guidelines we currently follow implicitly, this makes them more official and available for reference/discussion.
      
      It also exists as a reference for certain patterns we use which may be unfamiliar to new contributors, e.g. the per-page JS.
      
      Feel free to give feedback on wording, missing sections/guidelines, whether a guideline should even exist, etc.
      
      See merge request !5477
      df100ca2
    • Jacob Schatz's avatar
      Merge branch '21369-make-it-clearer-that-diffs-can-be-collapsed' into 'master' · 964d1bb1
      Jacob Schatz authored
      Updated diff toggle targets and added icon
      
      ## What does this MR do?
      
      Adds the new diff toggle icon and alters the toggle targets.
      
      User can now click on the file header bar _(where no other elements are above it, apart from the icon)_ and the `Click to expand` link to expand the diff and no where else.
      
      ## Are there points in the code the reviewer needs to double check?
      
      ## Why was this MR needed?
      
      ## Screenshots (if relevant)
      
      ![Screen_Shot_2016-09-02_at_15.35.15](/uploads/c1cb8c0547328153250294d6c95dd96a/Screen_Shot_2016-09-02_at_15.35.15.png)
      
      ####  Gif
      
      ![2016-09-02_15.34.31](/uploads/abaefaeba9ce8ef129522dae34574c57/2016-09-02_15.34.31.gif)
      
      ## 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 #21369 
      
      Closes #20326
      
      See merge request !6183
      964d1bb1
  2. 30 Sep, 2016 36 commits