1. 21 Mar, 2016 10 commits
    • Douwe Maan's avatar
      Merge branch 'fix-image-diff' into 'master' · 21e54d94
      Douwe Maan authored
      Fix bug where wrong commit ID was being used in a merge request diff to show old image
      
      Closes #3769
      
      Closes #14327
      
      See merge request !3300
      21e54d94
    • Jacob Schatz's avatar
      Merge branch 'remove-wip' into 'master' · 42c43041
      Jacob Schatz authored
      Easily (un)mark merge request as WIP using link
      
      Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/3768 and https://gitlab.com/gitlab-org/gitlab-ce/issues/3516
      
      ## Link to add `WIP` prefix (underline is visible because of hover)
      ![wipless_title](/uploads/72a6f7119ba9d8043ca8329641e97c3b/wipless_title.png)
      
      ## Link to remove `WIP` prefix
      ![wip_title](/uploads/8620ad65da9ef620b180603520fead55/wip_title.png)
      
      ## System note after WIP is added
      ![wip_sysnote](/uploads/2de073b75e854d2c9e243eb8b5d5c259/wip_sysnote.png)
      
      ## Widget with link to remove WIP
      ![wip_widget](/uploads/cf83ea93743c4c26d9df759c17cb9d7b/wip_widget.png)
      
      ## Flash after WIP is removed
      ![wip_flash](/uploads/27b7240cd5d7ceeb8b7b477abd94d7ff/wip_flash.png)
      
      ## System note after WIP is removed
      ![wipless_sysnote](/uploads/c0d3368abdf21a2f253532a9a9594d90/wipless_sysnote.png)
      
      ## Widget when current user cannot remove the WIP prefix
      ![wip_widget_unauthorized](/uploads/174ccf1674be86dc81c3078fe297acb7/wip_widget_unauthorized.png)
      
      cc @creamzy 
      
      See merge request !3006
      42c43041
    • Rémy Coutable's avatar
      Merge branch 'backport-ee-premailer' into 'master' · e6961c46
      Rémy Coutable authored
      Backport premailer and diff changes from EE
      
      Backport part of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/151
      
      See merge request !3318
      e6961c46
    • Jacob Schatz's avatar
      Merge branch 'rs-auto-expand-sidebar' into 'master' · aadbe610
      Jacob Schatz authored
      Expand the issuable sidebar when coming back from the Changes tab
      
      Unless the user explicitly requested the collapsed sidebar.
      
      Fixes: #14353
      
      See merge request !3256
      aadbe610
    • Douwe Maan's avatar
      Merge branch 'issue-branch-iid-postfix' into 'master' · a4e19b6c
      Douwe Maan authored
      #to_branch_name now uses the iid as postfix
      
      Given the branch name 'mep-mep' with an iid being 1,
      the current way, master's way, would yield a branch name of
      1-mep-mep. The problem for larger projects however would be that
      a developer might forget what iid the issue was.
      
      When this developer would try to tab complete it would:
      - Or result in 20+ branches possibly
      - Or start with the wrong digit, try again with digit++
        - Would see 20 branches, repeat
      
      Thus the obvious way of solving this is letting the dev tab complete
      on the issue title, which is easier to remember.
      
      @DouweM Should this be labelled `pick-in-master`? 
      
      See merge request !3308
      a4e19b6c
    • Robert Speicher's avatar
      Merge branch 'fix/14418' into 'master' · 8b90b1f3
      Robert Speicher authored
      Dedupe labels in labels selector in Dashboard pages
      
      Fixes #14418.
      
      See merge request !3311
      8b90b1f3
    • Jacob Schatz's avatar
      Merge branch 'edit-form-alignment' into 'master' · e0d4744a
      Jacob Schatz authored
      Fix spacing below edit note form
      
      Also changed to allow the CSS to decide what should be hidden when editing
      
      Thanks @JobV for having eagle eyes 😜 
      
      See merge request !3306
      e0d4744a
    • Jacob Schatz's avatar
      Merge branch 'dropdown-persits-filtered-data' into 'master' · 726242c2
      Jacob Schatz authored
      Fixed issue with filtered data persisting when dropdown closed
      
      ![labels](/uploads/4b9c902add76263d8488cc34ef49f142/labels.gif)
      
      Closes #14401
      
      See merge request !3302
      726242c2
    • Douwe Maan's avatar
      Merge branch 'label-tooltip' into 'master' · 2b07702a
      Douwe Maan authored
      Add label description in tooltip to labels in issue index and sidebar
      
      The tooltip can get quite big, but it’s so useful to inform people about what these labels mean
      new
      
      ![Screen_Shot_2016-03-08_at_11.48.28](/uploads/894baaaa1f789c3a2069a924d541e64b/Screen_Shot_2016-03-08_at_11.48.28.png)
      
      ![Screen_Shot_2016-03-08_at_11.48.20](/uploads/efe4fa0960054c4071b8f6bf83024403/Screen_Shot_2016-03-08_at_11.48.20.png)
      
      @JobV writes on Slack:
      > yeah I think it’s better than not, but I’d have to try it 😃 
      > 
      > cautious yes, revert if it’s annoying 😉
      
      See merge request !3124
      2b07702a
    • Achilleas Pipinellis's avatar
      Merge branch 'master' into 'master' · dd2b4d7b
      Achilleas Pipinellis authored
      Add information about `image` and `services` field at `job` level in the `.gitlab-ci.yml` documentation
      
      Fixes #14366
      
      /cc @tmaczukin @ayufan @axil
      
      See merge request !3277
      dd2b4d7b
  2. 18 Mar, 2016 28 commits
  3. 17 Mar, 2016 2 commits