1. 13 Oct, 2016 9 commits
    • Fatih Acet's avatar
      Merge branch 'project-edit-branch-dropdown-fix' into 'master' · 8ca0387f
      Fatih Acet authored
      Fixed default branch dropdown not converting to select2
      
      ## What does this MR do?
      
      The LFS dropdown doesn't have the `data` attribute & it isn't needed because it doesn't hide/show any elements. This filters out the `<select>` without that attribute.
      
      ## What are the relevant issue numbers?
      
      Closes #23200
      
      See merge request !6810
      8ca0387f
    • Fatih Acet's avatar
      Merge branch 'grouped-builds-arrow' into 'master' · 3f95461f
      Fatih Acet authored
      Fix overflow to show grouped builds arrow
      
      ## What does this MR do?
      Removes overflow style so that the arrow shows up again
      
      ## Screenshots (if relevant)
      Before:   
      ![Screen_Shot_2016-10-11_at_9.11.55_AM](/uploads/92d2a0c34d2af050e58468c8d61f4cd3/Screen_Shot_2016-10-11_at_9.11.55_AM.png)
      After:   
      ![Screen_Shot_2016-10-11_at_9.11.41_AM](/uploads/2c4c422a21fb6450d00ae638aef29d89/Screen_Shot_2016-10-11_at_9.11.41_AM.png)
      Scrolling:   
      ![Screen_Shot_2016-10-11_at_9.40.36_AM](/uploads/e5b1e3125d881c5882cf199026110d48/Screen_Shot_2016-10-11_at_9.40.36_AM.png)
      
      See merge request !6808
      3f95461f
    • Kamil Trzciński's avatar
      Merge branch 'feature/improve-mrwbs-and-todos-for-pipelines' into 'master' · 4eed16cf
      Kamil Trzciński authored
      Trigger Merge When Pipeline Succeeds on pipeline event
      
      ## What does this MR do?
      
      This MR is meant to improve merge when build succeeds triggers, which has an impact on performance.
      
      - [x] Move Merge When Build Succeeds trigger from commit status to pipeline event
      - [x] Drop support for triggering event for branches that include commit status submitted without branch (no longer relevant)
      - [x] Perform Merge When Pipeline Succeeds asynchronously to improve performance and avoid race conditions
      - [x] Add missing feature test that verifies if MWBS feature actually works and merges merge requests
      - [x] Update the documentation to reflect change in the behavior
      
      Moved to separate merge request:
      
      - [ ] Rename Merge When Build Succeeds to Merge When Pipeline Succeeds
      - [ ] Update documentation to reflect name change for this feature
      
      ## Does this MR meet the acceptance criteria?
      
      - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
      - Tests
        - [x] Added for this feature/bug
        - [x] All builds are passing
      
      See merge request !6675
      4eed16cf
    • Fatih Acet's avatar
      Merge branch 'trim-new-user' into 'master' · 2208a878
      Fatih Acet authored
      Ensure that whitespace doesn't cause adding members to fail
      
      I recently had to debug an issue where adding users wasn't working. It turned out that I was hitting "space" to confirm a `select2` dialog, and the server would throw out the whole email address because it was invalid. It looked as though GitLab was entirely ignoring my add-member request.
      
      Here's a fun gif:
      ![out](/uploads/5c306addb764067bca54add3b7a53c6c/out.gif)
      
      Ideally, there should also be validation client-side, so that the server doesn't need to silently fail, and the user will know what's going wrong. I'll look into creating an issue for that.
      
      Additionally, GitLab already seems to trim email addresses, sometimes? If you add _two_ address, with spaces, then the `value` of the `user_ids` DOM element will have the first `n-1` addresses without spaces. Weird.
      
      **TL;DR: Now spaces are always trimmed from new-member email addresses.**
      
      See merge request !3443
      2208a878
    • Fatih Acet's avatar
      Merge branch '22635-clipboard-icon' into 'master' · a053430e
      Fatih Acet authored
      Fix "Copy to clipboard" action button has a mismatching white background.
      
      ## What does this MR do?
      Adds a class to all the clipboard icons which removes the extra padding.
      It also fixes some odd overlay when over the clipboard icon in commits list.
      
      ## Are there points in the code the reviewer needs to double check?
      No.
      
      ## Why was this MR needed?
      To fix the extra padding and background color that was visible when it should not be
      
      ## Screenshots (if relevant)
      ![commits_list](/uploads/f988e2e2e2aea41fe3f7fe41c8a857ef/commits_list.png)
      ![file](/uploads/ce97909fc4e602af47fea46b8fffb7ad/file.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
        - [ ] Added for this feature/bug
        - [x] All builds are passing
      - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
      - [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 it does - 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 #22635
      
      See merge request !6785
      a053430e
    • Rémy Coutable's avatar
      Merge branch 'fix-some-specs' into 'master' · 9d44ef2b
      Rémy Coutable authored
      Improve appearance_spec and deploy_key_spec
      
      In appearance_spec.rb we can use build instead create record in db. In deploy_key_spec.rb we can remove unused code.
      
      See merge request !6819
      9d44ef2b
    • Rémy Coutable's avatar
      Merge branch 'refactor-event-spec' into 'master' · 1524832f
      Rémy Coutable authored
      Union examples in event spec for speed up
      
      ## What does this MR do?
      
      Increase tests speed for event model.
      
      ## Why was this MR needed?
      
      This change saves about 15-18 seconds.
      
      See merge request !6821
      1524832f
    • Yorick Peterse's avatar
      Merge branch 'update-gitlab-shell' into 'master' · 23a2a8ef
      Yorick Peterse authored
      Update to gitlab-shell 3.6.6
      
      ## What does this MR do?
      
      This updates gitlab-shell to version 3.6.6
      
      ## Does this MR meet the acceptance criteria?
      
      - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
      - Tests
        - [ ] All builds are passing
      - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
      - [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 it does - 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?
      
      See merge request !6830
      23a2a8ef
    • Semyon Pupkov's avatar
      Union examples in event spec fo speed up · 48015ded
      Semyon Pupkov authored
      48015ded
  2. 12 Oct, 2016 31 commits