1. 30 8月, 2016 15 次提交
    • K
      User can edit closed MR with deleted fork · c9c2503c
      Katarzyna Kobierska 提交于
      Add test for closed MR without fork
      
      Add view test visibility of Reopen and Close buttons
      
      Fix controller tests and validation method
      
      Fix missing space
      
      Remove unused variables from test
      
      closed_without_fork? method refactoring
      
      Add information about missing fork
      
      When closed MR without fork can't edit target branch
      
      Tests for closed MR edit view
      
      Fix indentation and rebase, refactoring
      c9c2503c
    • F
      Merge branch '919-protected-branch-dropdown-all-users' into 'master' · 2778dec1
      Fatih Acet 提交于
      Ensure we update dropdown label after input has been added
      
      Backport changes from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/687
      
      See merge request !5999
      2778dec1
    • F
      Merge branch 'css-logo-animation' into 'master' · 0f72fc86
      Fatih Acet 提交于
      Change logo animation to CSS
      
      ## What does this MR do?
      Converts the tanuki logo animation from javascript to CSS. You can now animate the tanuki svg logo by adding the CSS Class `animate`to it.
      
      ## Are there points in the code the reviewer needs to double check?
      Just need to double check for browser compatibility
      
      ## Why was this MR needed?
      
      *  Using CSS for simple animations is a best practice (Optimizes DOM, uses GPU to do animation rather than CPU)
      *  Happy DOM 🎈 
      
      ## What are the relevant issue numbers?
      Closes #20607 
      
      ## Screenshots (if relevant)
      Before DOM
      ![8BrOJAqT4U](/uploads/705a3c7b53c45d32d435cafecfc958bd/8BrOJAqT4U.gif)
      
      After DOM
      ![Screen_Shot_2016-08-03_at_10.30.08_PM](/uploads/e82d9b63501def4dc4e67a5659863680/Screen_Shot_2016-08-03_at_10.30.08_PM.png)
      
      Before
      ![JnEgliIIVO](/uploads/39aaec48fd3e193f20cf455371ea2d13/JnEgliIIVO.gif)
      
      After (Basically the same, hard to tell in my gif though because it was hard to get the timings right on the recording)
      ![fvLeXxmp3U](/uploads/058cf15fffed4be549af2e963eca4412/fvLeXxmp3U.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)
      
      See merge request !5655
      0f72fc86
    • F
      Merge branch 'remove-unused-mixins' into 'master' · 77fd0a04
      Fatih Acet 提交于
      Remove unused mixins
      
      ## What does this MR do?
      Remove unused mixins
      
      ## Are there points in the code the reviewer needs to double check?
      None
      
      ## Why was this MR needed?
      Reduces unused css
      
      ## Screenshots (if relevant)
      Before:
      ```
      $git grep 'btn-big' -- '*.scss'
      app/assets/stylesheets/framework/mixins.scss:107:@mixin btn-big {
      
      $git grep 'input-big' -- '*.scss'
      app/assets/stylesheets/framework/mixins.scss:97:@mixin input-big {
      
      $git grep 'solid-shade' -- '*.scss'
      app/assets/stylesheets/framework/mixins.scss:45:@mixin solid-shade {
      
      $git grep 'shade' -- '*.scss'
      app/assets/stylesheets/framework/mixins.scss:41:@mixin shade {
      app/assets/stylesheets/framework/mixins.scss:45:@mixin solid-shade {
      
      $git grep 'linear-gradient' -- '*.scss'
      app/assets/stylesheets/framework/buttons.scss:310:  background: linear-gradient(180deg, $white-light 25%, $gray-light 100%);
      app/assets/stylesheets/framework/mixins.scss:20:@mixin linear-gradient($from, $to) {
      app/assets/stylesheets/framework/mixins.scss:22:  background-image: -webkit-linear-gradient($from, $to);
      app/assets/stylesheets/framework/mixins.scss:23:  background-image: -moz-linear-gradient($from, $to);
      app/assets/stylesheets/framework/mixins.scss:24:  background-image: -ms-linear-gradient($from, $to);
      app/assets/stylesheets/framework/mixins.scss:25:  background-image: -o-linear-gradient($from, $to);
      app/assets/stylesheets/framework/nav.scss:11:  background: -webkit-linear-gradient($gradient-direction, rgba($gradient-color, 0.4), $gradient-color 45%);
      app/assets/stylesheets/framework/nav.scss:12:  background: -o-linear-gradient($gradient-direction, rgba($gradient-color, 0.4), $gradient-color 45%);
      app/assets/stylesheets/framework/nav.scss:13:  background: -moz-linear-gradient($gradient-direction, rgba($gradient-color, 0.4), $gradient-color 45%);
      app/assets/stylesheets/framework/nav.scss:14:  background: linear-gradient($gradient-direction, rgba($gradient-color, 0.4), $gradient-color 45%);
      app/assets/stylesheets/pages/diff.scss:167:        background-image: linear-gradient(45deg, #e5e5e5 25%, transparent 25%, transparent 75%, #e5e5e5 75%, #e5e5e5 100%),
      app/assets/stylesheets/pages/diff.scss:168:        linear-gradient(45deg, #e5e5e5 25%, transparent 25%, transparent 75%, #e5e5e5 75%, #e5e5e5 100%);
      
      $git grep 'border-radius-left' -- '*.scss'
      app/assets/stylesheets/framework/mixins.scss:12:@mixin border-radius-left($radius) {
      
      $git grep 'border-radius-right' -- '*.scss'
      app/assets/stylesheets/framework/mixins.scss:16:@mixin border-radius-right($radius) {
      ```
      
      After:
      ```
      $git grep 'btn-big' -- '*.scss'
      (nothing)
      
      $git grep 'input-big' -- '*.scss'
      (nothing)
      
      $git grep 'solid-shade' -- '*.scss'
      (nothing)
      
      $git grep 'shade' -- '*.scss'
      (nothing)
      
      $git grep 'linear-gradient' -- '*.scss'
      app/assets/stylesheets/framework/buttons.scss:310:  background: linear-gradient(180deg, $white-light 25%, $gray-light 100%);
      app/assets/stylesheets/framework/nav.scss:11:  background: -webkit-linear-gradient($gradient-direction, rgba($gradient-color, 0.4), $gradient-color 45%);
      app/assets/stylesheets/framework/nav.scss:12:  background: -o-linear-gradient($gradient-direction, rgba($gradient-color, 0.4), $gradient-color 45%);
      app/assets/stylesheets/framework/nav.scss:13:  background: -moz-linear-gradient($gradient-direction, rgba($gradient-color, 0.4), $gradient-color 45%);
      app/assets/stylesheets/framework/nav.scss:14:  background: linear-gradient($gradient-direction, rgba($gradient-color, 0.4), $gradient-color 45%);
      app/assets/stylesheets/pages/diff.scss:167:        background-image: linear-gradient(45deg, #e5e5e5 25%, transparent 25%, transparent 75%, #e5e5e5 75%, #e5e5e5 100%),
      app/assets/stylesheets/pages/diff.scss:168:        linear-gradient(45deg, #e5e5e5 25%, transparent 25%, transparent 75%, #e5e5e5 75%, #e5e5e5 100%);
      
      $git grep 'border-radius-left' -- '*.scss'
      (nothing)
      
      $git grep 'border-radius-right' -- '*.scss'
      (nothing)
      ```
      
      ## 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 #21559
      
      See merge request !6092
      77fd0a04
    • F
      Merge branch 'keep-committing-spinner-when-conflict-resolved' into 'master' · b283185b
      Fatih Acet 提交于
      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
    • F
      Merge branch... · b94f26ce
      Fatih Acet 提交于
      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
    • F
      Merge branch '21070-graph-tooltip' into 'master' · 35566fd9
      Fatih Acet 提交于
      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
    • A
      Merge branch '21123-pipeline-graph-link' into 'master' · 11b9bf0f
      Annabel Dunstone Gray 提交于
      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
    • A
      Merge branch 'doc/styleguide-fix-grep' into 'master' · 773bca38
      Achilleas Pipinellis 提交于
      Clarify steps when changing a document's location
      
      Clarify the steps needed to change a document's location so issues like
      https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6024
      don't occur.
      
      See merge request !6070
      773bca38
    • A
      Use `git grep` instead of `grep` · d30d9928
      Achilleas Pipinellis 提交于
      [ci skip]
      d30d9928
    • A
      Merge branch 'push-event-vertical-space' into 'master' · 28e6089a
      Annabel Dunstone Gray 提交于
      Make push events have equal vertical spacing.
      
      ## What does this MR do?
      
      Evens out the vertical space between lines in push events.
      
      ## Are there points in the code the reviewer needs to double check?
      
      Not afaik. 
      
      ## Why was this MR needed?
      
      UI consistency.
      
      ## What are the relevant issue numbers?
      
      https://gitlab.com/gitlab-org/gitlab-ce/issues/19517
      
      ## Screenshots (if relevant)
      
      Before: 
      ![Screen_Shot_2016-08-26_at_5.23.33_PM](/uploads/78e7a89912ec504d598f9bfec2a83eea/Screen_Shot_2016-08-26_at_5.23.33_PM.png)
      After: 
      ![Screen_Shot_2016-08-26_at_5.23.16_PM](/uploads/3fa3e0902ef76b1e9c82e052842cd0ee/Screen_Shot_2016-08-26_at_5.23.16_PM.png)
      
      
      
      
      ## Does this MR meet the acceptance criteria?
      
      - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
      - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
      - [x] API support added
      - Tests
        - [ ] Added for this feature/bug
        - [ ] 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)
      
      cc: @winniehell
      
      See merge request !6055
      28e6089a
    • A
      Keep CI icons being clickable · 3e1467ec
      Alfredo Sumaran 提交于
      3e1467ec
    • A
      Move status icon out of build graph links · 19e58c9c
      Annabel Dunstone 提交于
      19e58c9c
    • B
      Make push events have equal vertical spacing. · 157c3acb
      Bryce 提交于
      157c3acb
    • C
      Remove unused mixins · 48e53bf0
      Clement Ho 提交于
      48e53bf0
  2. 29 8月, 2016 8 次提交
  3. 28 8月, 2016 2 次提交
  4. 27 8月, 2016 5 次提交
  5. 26 8月, 2016 10 次提交