1. 21 Mar, 2016 13 commits
    • Jacob Schatz's avatar
      Merge branch 'remove-console-log' into 'master' · 2bcbc7c6
      Jacob Schatz authored
      Remove console.log call
      
      
      
      See merge request !3322
      2bcbc7c6
    • Robert Speicher's avatar
      Merge branch 'issues-show-performance' into 'master' · ffc3acd4
      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
      ffc3acd4
    • 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
    • Yorick Peterse's avatar
      Create SSH keys for SSH clone Spinach tests · 75aaf91c
      Yorick Peterse authored
      These tests would check if the "This project is empty" banner would
      contain SSH clone URLs. Oddly enough this should have never passed (as
      far as I can tell) as SSH clone URLs in this banner are _only_ displayed
      if the current user has at least 1 SSH key attached. Since the tests
      never seem to create any they never should have passed, yet somehow they
      did. To solve this the Spinach tests in question now ensure at least 1
      SSH key is present.
      75aaf91c
    • 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 17 commits
  3. 19 Mar, 2016 10 commits