1. 31 Aug, 2016 1 commit
  2. 30 Aug, 2016 35 commits
  3. 29 Aug, 2016 4 commits
    • Fatih Acet's avatar
      Merge branch 'keep-committing-spinner-when-conflict-resolved' into 'master' · b283185b
      Fatih Acet authored
      Keep committing ... spinner when conflict resolved
      
      ## What does this MR do?
      
      When a conflict is resolved successfully, keep the 'committing ...' spinner until the new page loads rather than showing the standard button again, which is misleading. The old behaviour looks like this:
      
      ![Resolve_merge_conflict](/uploads/8e0efec0bb4b1358d4dd3353ea1dc57b/Resolve_merge_conflict.gif)
      
      I don't think this needs a CHANGELOG entry as it's pretty minor.
      
      See merge request !5892
      b283185b
    • Fatih Acet's avatar
      Merge branch... · b94f26ce
      Fatih Acet authored
      Merge branch '21285-new-merge-request-source-and-target-branch-fields-filters-both-source-and-target-list' into 'master'
      
      Fixed issue where filtering one dropdown will filter another on the page
      
      ## What does this MR do?
      
      Moved `.option-hidden` to exist only in `SELECTABLE_CLASSES` as `NON_SELECTABLE_CLASSES` is used to re-show previously hidden elements.
      
      ## Are there points in the code the reviewer needs to double check?
      
      ## Why was this MR needed?
      
      ## What are the relevant issue numbers?
      
      Closes #21285.
      
      ## Screenshots (if relevant)
      
      ![2016-08-24_15.59.16](/uploads/8282bd6507d10de61097956a57bd63cc/2016-08-24_15.59.16.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 [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)
      Closes #21285
      
      See merge request !5985
      b94f26ce
    • Fatih Acet's avatar
      Merge branch '21070-graph-tooltip' into 'master' · 35566fd9
      Fatih Acet authored
      Add body as data-container on pipeline graph tooltip
      
      ## What does this MR do?
      Fixed data tooltip getting cut off
      
      ## What are the relevant issue numbers?
      Closes #21070 
      
      ## Screenshots (if relevant)
      ![Screen_Shot_2016-08-23_at_8.45.42_AM](/uploads/87f072cfc2fdeced6161db6bec46320a/Screen_Shot_2016-08-23_at_8.45.42_AM.png)
      
      See merge request !5955
      35566fd9
    • Annabel Dunstone Gray's avatar
      Merge branch '21123-pipeline-graph-link' into 'master' · 11b9bf0f
      Annabel Dunstone Gray authored
      Removes leading space from hover state in graph links
      
      #### What are the relevant issue numbers?
      Closes #21123 
      
      #### Screenshots (if relevant)
      ![Screen_Shot_2016-08-24_at_8.35.15_AM](/uploads/2dc583391f87c6d0a67f0535967c637f/Screen_Shot_2016-08-24_at_8.35.15_AM.png)
      
      See merge request !5980
      11b9bf0f