1. 30 Aug, 2016 5 commits
    • Achilleas Pipinellis's avatar
      Merge branch 'doc/update-api-project-id' into 'master' · 53fbb4ac
      Achilleas Pipinellis authored
      Mention that the `:id` of a project can also be `NAMESPACE/PROJECT_NAME`
      
      Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/18936
      
      See merge request !6102
      53fbb4ac
    • Achilleas Pipinellis's avatar
    • Fatih Acet's avatar
      Merge branch '919-protected-branch-dropdown-all-users' into 'master' · 2778dec1
      Fatih Acet authored
      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
    • Fatih Acet's avatar
      Merge branch 'css-logo-animation' into 'master' · 0f72fc86
      Fatih Acet authored
      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
    • Fatih Acet's avatar
      Merge branch 'remove-unused-mixins' into 'master' · 77fd0a04
      Fatih Acet authored
      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
  2. 29 Aug, 2016 17 commits
  3. 28 Aug, 2016 2 commits
  4. 27 Aug, 2016 2 commits
  5. 26 Aug, 2016 14 commits