1. 21 Mar, 2016 10 commits
    • Kamil Trzciński's avatar
      Merge branch 'feature/issue-move' into 'master' · 3fca30d2
      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
      3fca30d2
    • Rémy Coutable's avatar
      Merge branch 'workhorse-0.7.1' into 'master' · bfcdb47c
      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
      bfcdb47c
    • Dmitriy Zaporozhets's avatar
      Merge branch 'fix-image-mode-view-diff' into 'master' · 08a892b0
      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
      08a892b0
    • Dmitriy Zaporozhets's avatar
      Merge branch 'rs-use-kaminari-default' into 'master' · cbc07625
      Dmitriy Zaporozhets authored
      Use the configured Kaminari "per page" default
      
      Configured in [`config/initializers/kaminari.rb`](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/config/initializers/kaminari_config.rb).
      
      See merge request !3320
      cbc07625
    • Grzegorz Bizon's avatar
      db8f70d5
    • Jacob Vosmaer's avatar
      Gitlab-workhorse tags have "v" now · 016c6da7
      Jacob Vosmaer authored
      016c6da7
    • Jacob Vosmaer's avatar
      Use gitlab-workhorse 0.7.1 · 3d750563
      Jacob Vosmaer authored
      3d750563
    • Rémy Coutable's avatar
      Merge branch 'backport-ee-premailer' into 'master' · 17de30f4
      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
      17de30f4
    • Robert Speicher's avatar
      Merge branch 'upgrade-rubocop' into 'master' · b9fb48bc
      Robert Speicher authored
      Upgrade Rubocop from 0.35.1 to 0.38.0
      
      See [Rubocop's Releases page](https://github.com/bbatsov/rubocop/releases) for more info on what changed.
      
      Descriptions/StyleGuides removed as discussed in #14233.
      
      Changes:
      - Enable DisplayCopNames for lint output.
      - Default behavior for `Alias` changed, set to enforce `prefer_alias_method`.
      - Enabling Rails cops changed to new syntax.
      - Remove StyleGuides and move Descriptions to comments.
      - Add missing cops.
      - Add TODOs for cops that should be enabled in the future.
      - Set TargetRubyVersion to 2.1.
      
      See merge request !3197
      b9fb48bc
    • connorshea's avatar
      Update Rubocop from 0.35.1 to 0.38.0. · 6274136c
      connorshea authored
      Discussed in #14233.
      
      See [their releases](https://github.com/bbatsov/rubocop/releases) for
      more info.
      
      Changes:
      - Enable DisplayCopNames for lint output.
      - Default behavior for `Alias` changed, set to enforce `prefer_alias_method`.
      - Enabling Rails cops changed to new syntax.
      - Remove StyleGuides and move Descriptions to comments.
      - Add missing cops.
      - Add TODOs for cops that should be enabled in the future.
      - Set TargetRubyVersion to 2.1.
      6274136c
  2. 20 Mar, 2016 16 commits
  3. 19 Mar, 2016 14 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
    • Robert Speicher's avatar
      085538c2
    • 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
      Move diff line to separate partial · afbcdd8e
      Douwe Maan authored
      afbcdd8e
    • Douwe Maan's avatar
      Inline mailer CSS using premailer. · a8aa59e9
      Douwe Maan authored
      # Conflicts:
      #	Gemfile.lock
      a8aa59e9
    • 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