1. 20 Mar, 2016 5 commits
  2. 19 Mar, 2016 11 commits
    • Douwe Maan's avatar
      Merge branch 'fix-image-diff' into 'master' · 01fe50a7
      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
      01fe50a7
    • Stan Hu's avatar
      Fix bug where wrong commit ID was being used in a merge request diff to show old image · 79ad6e0e
      Stan Hu authored
      Closes #3769
      
      Closes #14327
      79ad6e0e
    • 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)
      ![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
      3f22a92f
    • 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
      64b57ec8
    • 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
      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
      0ce7c1e4
    • 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
      cb124d14
    • Grzegorz Bizon's avatar
      a2f25ed6
    • Grzegorz Bizon's avatar
      Update reference unfolder according to recent ability changes · 18f25bc9
      Grzegorz Bizon authored
      Commit 43d8bdb4 introduced additional
      checks for permissions to read issue in references extractor.
      18f25bc9
    • Grzegorz Bizon's avatar
      Merge branch 'master' into feature/issue-move · 0115ad66
      Grzegorz Bizon authored
      * master: (121 commits)
        Dedupe labels in labels selector in Dashboard pages
        Refactor colors and lists
        Add a safeguard in MergeRequest#compute_diverged_commits_count
        Fix an issue when the target branch of a MR had been deleted
        Add avatar to issue and MR pages header
        Cleanup somce css colors
        Re-group scss variables
        Refactor `Todo#target`
        Fixes issue with filter label missing on labels & milestones
        Rename `Todo#to_reference` to `Todo#target_reference`
        Fixed failing tests
        Updated controller with before_action Fixed other issues based on feedback
        Fixes issue on dashboard issues
        Full labels data in JSON
        Fixed issue with labels dropdown getting wrong labels
        Update CHANGELOG
        Use `Note#for_project_snippet?` to skip notes on project snippet
        Use `Commit#short_id` instead of `Commit.truncate_sha`
        Reuse `for_commit?` on conditional validations
        Update schema info comment on todo related files
        ...
      
      Conflicts:
      	app/models/issue.rb
      	db/schema.rb
      	spec/models/issue_spec.rb
      0115ad66
    • Grzegorz Bizon's avatar
      Improvements in issue move feaure (refactoring) · 9b13ce0b
      Grzegorz Bizon authored
      According to endbosses' suggestions.
      9b13ce0b
    • 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
      4f0302f0
  3. 18 Mar, 2016 24 commits