1. 19 Mar, 2016 6 commits
    • Robert Speicher's avatar
    • Jacob Schatz's avatar
      Merge branch 'remove-wip' into 'master' · 3f22a92f
      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)
      ## Link to remove `WIP` prefix
      ## System note after WIP is added
      ## Widget with link to remove WIP
      ## Flash after WIP is removed
      ## System note after WIP is removed
      ## Widget when current user cannot remove the WIP prefix
      cc @creamzy 
      See merge request !3006
    • Douwe Maan's avatar
      Merge branch 'fix/gitlab-omniauth-issue' into 'master' · 64b57ec8
      Douwe Maan authored
      attempting to fix omniauth problem
      Attempt to fix https://gitlab.com/gitlab-org/gitlab-ce/issues/3361
      See merge request !2876
    • Douwe Maan's avatar
      Merge branch 'label-tooltip' into 'master' · 0ce7c1e4
      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
      @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
    • Douwe Maan's avatar
      Merge branch 'issue-branch-iid-postfix' into 'master' · cb124d14
      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
    • Achilleas Pipinellis's avatar
      Merge branch 'master' into 'master' · 4f0302f0
      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
  2. 18 Mar, 2016 34 commits