1. 23 Mar, 2016 5 commits
  2. 22 Mar, 2016 13 commits
  3. 21 Mar, 2016 18 commits
    • Rémy Coutable's avatar
      Version 8.6.0-rc5 · 939f306a
      Rémy Coutable authored
      939f306a
    • Dmitriy Zaporozhets's avatar
      Merge branch 'fix-image-mode-view-diff' into 'master' · 834dae6f
      Dmitriy Zaporozhets authored
      Fix diff image view modes (2-up, swipe, onion skin) not working
      
      Example test case: https://gitlab.com/mrtzcspr/test/commit/5d983226b1308d98ef3d8919b978ad49f34496b8
      
      Closes #13856
      
      See merge request !3316
      834dae6f
    • Rémy Coutable's avatar
      Merge branch 'workhorse-0.7.1' into 'master' · c5e015e9
      Rémy Coutable authored
      Use gitlab-workhorse 0.7.1
      
      A small extra defense against interrupted git raw responses. Nice to
      have in 8.6 because we introduce /raw/ caching; it would be
      unfortunate if incorrect (truncated) responses got cached.
      
      See merge request !3330
      c5e015e9
    • Robert Speicher's avatar
      Merge branch 'issues-show-performance' into 'master' · b8812824
      Robert Speicher authored
      Improve performance of viewing individual issues
      
      This MR does two things:
      
      1. `Issue#related_branches` no longer performs Git operations that aren't needed
      2. The output of `Repository#exists?` is now cached and flushed properly
      
      Combined these two changes should further cut down the amount of Git operations performed when viewing individual issues (and possibly other pages).
      
      See merge request !3296
      b8812824
    • Kamil Trzciński's avatar
      Merge branch 'feature/issue-move' into 'master' · ab3681d1
      Kamil Trzciński authored
      Ability to move issue to another project
      
      Tasks:
      
      - [x] Create scaffold of service that will move issue to another project.
      - [x] Close old issue, add system note about moving issue to a new project.
      - [x] Create a new issue, add system note about issue being moved from old project.
      - [x] Check if issue can be moved to another project before executing service
      - [x] Check permissions when moving an issue (`:admin_issue` ability)
      - [x] Display select box for a new project when editing an issue
      - [x] Show only projects that issue can be moved into in that select box
      - [x] Add project select handler, helper and some permission filters to it
      - [x] Preserve as much information as possible, including author
      - [x] Prepare mechanisms that unfolds local references in issue description
      - [x] Rewrite issue description with references unfolding and add some specs for it
      - [x] Rewrite all system notes and comments attached to issue that is being moved
      - [x] Update `Label` so that is was able to create cross reference labels (separate MR)
      - [x] Add notifications about moving issue to another project
      - [x] Display confirmation alert/message when issue move has been requested
      - [x] Make it possible to undo selecting project where issue will be moved to
      - [x] Add column to issue, that will indicate if it has been moved to another project
      - [x] Do not allow to move issue that has been already moved
      - [x] Write top-to-bottom feature spec in RSpec instead of Spinach
      
      UI:
      
      ![issue_move_ui](/uploads/b3c6b563362c1fded9082cc0f51e5a74/issue_move_ui.png)
      
      ![issue_move_tooltip](/uploads/2ab913b06f52df1cafde9abe89bd9cb8/issue_move_tooltip.png)
      
      Closes #3024
      
      See merge request !2831
      ab3681d1
    • Robert Speicher's avatar
      Merge branch 'no-gc-retry' into 'master' · c7f3bee7
      Robert Speicher authored
      Do not retry "git gc"
      
      To prevent 'git gc' timing out on a large repo and then bouncing
      around in the retry queue.
      
      See merge request !3266
      c7f3bee7
    • Douwe Maan's avatar
      Merge branch 'fix/gitlab-omniauth-issue' into 'master' · d22c1069
      Douwe Maan authored
      attempting to fix omniauth problem
      
      Attempt to fix https://gitlab.com/gitlab-org/gitlab-ce/issues/3361
      
      See merge request !2876
      d22c1069
    • Jacob Schatz's avatar
      Merge branch 'css-zero-unit-again' into 'master' · a2484ae0
      Jacob Schatz authored
      Fix a few remaining uses of `0px`.
      
      See #14299 for more information.
      
      cc: @jschatz1 
      
      See merge request !3310
      a2484ae0
    • 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
  4. 18 Mar, 2016 4 commits
    • Douwe Maan's avatar
      Merge branch 'trigger-todo-for-mentions-on-commits-page' into 'master' · 1793a65e
      Douwe Maan authored
      Trigger a todo for mentions on commits page
      
      Closes #14006 
      
      * Screenshot:
      
      ![todo-commit](/uploads/5d34de0b7afcea7548123dafddf60c45/todo-commit.png)
      
      See merge request !3262
      1793a65e
    • Jacob Schatz's avatar
      Merge branch 'optimistic-todos' into 'master' · 17d40eab
      Jacob Schatz authored
      Adds small AJAX optimistic functionality to todos.
      
      Fixes #13656 <br/>
      A good first step and boring solution. <br/>
      Will make ajax call to remove each issue.  <br/>
      If issue is last in group of issues will refresh page.  <br/>
      If issues remain in group will remove row with JS.  <br/>
      Adds loading spinner to button and disables. <br/>
      
      ![todos-optimistic](/uploads/c6aec4a688e5125d4df55a2a3a55d4d7/todos-optimistic.gif) <br/>
      
      cc @dzaporozhets @JobV @dbalexandre 
      
      See merge request !2946
      17d40eab
    • Douwe Maan's avatar
      Merge branch 'fix/14388' into 'master' · 17418461
      Douwe Maan authored
      Fix an issue when the target branch of a MR had been deleted
      
      Before displaying the "diverged commits" note, we're checking if the MR
      is open, but we should check if it's mergeable instead because this
      check ensure the source and target branches exist.
      
      This was introduced by !2217 and fixes #14388.
      
      See merge request !3294
      17418461
    • Douwe Maan's avatar
      Merge branch 'fix-mr-source-sha' into 'master' · 5b82e15b
      Douwe Maan authored
      Fix MergeRequest#source_sha when there is no diff
      
      Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14170
      
      ### Overview
      
      This MR fixes an unhandled Exception when visiting the page of an open Merge Request  without diff.
      
      ### Description
      
      `MergeRequest#source_sha` is expected to return the sha of the source branch last commit. But when an open Merge Request has no diff (e.g. all commits have already been merged to the target branch), `merge_request.source_sha` incorrectly returns `nil`.
      
      This was without consequences before – but since !2217 was merged (a few days ago), it makes `Gitlab::Git::Commit.between` raise an "Unexpected nil argument" exception. This can be reproduced when visiting the http://localhost:3000/gitlab-org/gitlab-test/merge_requests/2 page on a fresh local Gitlab setup.
      
      This MR fixes the crash, by making sure that `source_sha` returns a
      correct result even when there is no diff available. I also added tests.
      
      @DouweM I believe you wrote most of this code in the first place ; does this looks correct to you, or is there a better way to resolve this issue maybe?
      
      See merge request !3135
      5b82e15b