Commit Graph
25613 Commits
Author SHA1 Message Date
Alfredo Sumaran 4fcd7ba954 Set constants for category names 2016-03-21 23:01:42 -05:00
Alfredo Sumaran 521c0f5f08 Reduce the use of loops 2016-03-21 23:01:19 -05:00
Alfredo Sumaran a477d604f6 Add ability to clear location badge 2016-03-21 16:00:53 -05:00
Alfredo Sumaran eff98ffe05 TAB is not used 2016-03-21 14:23:29 -05:00
Alfredo Sumaran 3a8c4ebb43 Loop through form inputs 2016-03-21 14:01:20 -05:00
Alfredo Sumaran f7a97291c0 Add variables 2016-03-21 13:29:31 -05:00
Alfredo Sumaran 6e9ff2e574 Delete .remove-badge from badge 2016-03-21 13:18:34 -05:00
Alfredo Sumaran 80174538a8 Use .empty() 2016-03-21 12:31:21 -05:00
Alfredo Sumaran fb0d20c553 Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into issue_3400_port 2016-03-21 12:09:52 -05:00
Jacob Schatz 2bcbc7c6db Merge branch 'remove-console-log' into 'master'
Remove console.log call



See merge request !3322
2016-03-21 16:36:00 +00:00
Robert Speicher ffc3acd498 Merge branch 'issues-show-performance' into 'master'
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
2016-03-21 14:42:25 +00:00
Kamil Trzciński 3fca30d27f Merge branch 'feature/issue-move' into 'master'
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
2016-03-21 14:01:19 +00:00
Rémy Coutable bfcdb47c40 Merge branch 'workhorse-0.7.1' into 'master'
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
2016-03-21 13:40:20 +00:00
Dmitriy Zaporozhets 08a892b095 Merge branch 'fix-image-mode-view-diff' into 'master'
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
2016-03-21 13:38:30 +00:00
Dmitriy Zaporozhets cbc076256d Merge branch 'rs-use-kaminari-default' into 'master'
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
2016-03-21 13:17:27 +00:00
Grzegorz Bizon db8f70d508 Do not rewrite reference if already a cross reference 2016-03-21 14:12:49 +01:00
Jacob Vosmaer 016c6da7c6 Gitlab-workhorse tags have "v" now 2016-03-21 13:13:34 +01:00
Jacob Vosmaer 3d750563d2 Use gitlab-workhorse 0.7.1 2016-03-21 13:09:23 +01:00
Rémy Coutable 17de30f412 Merge branch 'backport-ee-premailer' into 'master'
Backport premailer and diff changes from EE

Backport part of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/151

See merge request !3318
2016-03-21 10:46:37 +00:00
Yorick Peterse 75aaf91cb1 Create SSH keys for SSH clone Spinach tests
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.
2016-03-21 11:40:13 +01:00
Robert Speicher b9fb48bc45 Merge branch 'upgrade-rubocop' into 'master'
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
2016-03-21 06:09:02 +00:00
connorshea 6274136c9a Update Rubocop from 0.35.1 to 0.38.0.
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.
2016-03-20 20:49:12 -06:00
Jacob Schatz d19abe6f65 Merge branch 'css-zero-unit-again' into 'master'
Fix a few remaining uses of `0px`.

See #14299 for more information.

cc: @jschatz1 

See merge request !3310
2016-03-20 19:33:04 +00:00
Stan Hu e79f4a79a4 Remove console.log call 2016-03-20 10:58:59 -07:00
Jacob Schatz 42fc4233e5 Merge branch 'fix-default-http-clone' into 'master'
Make HTTP(s) label consistent on clone bar

Sites that use http:// for the external_url should always display HTTP on
the clone bar. Similarly, sites that use https:// should show HTTPS.

Currently, the inconsistency looks like:

![http-magic](/uploads/945fda580f7ba5aee36cc572b49baf2b/http-magic.gif)

Also restores the tooltips that vanished in 7ba4482fcf:

![image](/uploads/b5a7b3e68b4992a447fcaa51915e866c/image.png)


See merge request !3319
2016-03-20 17:52:20 +00:00
Grzegorz Bizon 91963267a0 Change icon and cursor for issue move field tooltip 2016-03-20 17:38:08 +01:00
Grzegorz Bizon d6474f22d2 Preserve created at time of notes when moving issue 2016-03-20 17:05:21 +01:00
Jacob Schatz a4422a3a2e Merge branch 'edit-form-alignment' into 'master'
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
2016-03-20 15:54:49 +00:00
Jacob Schatz d3e9134601 Merge branch 'rs-auto-expand-sidebar' into 'master'
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
2016-03-20 15:10:16 +00:00
Jacob Schatz 1e420ccf59 Merge branch 'dropdown-persits-filtered-data' into 'master'
Fixed issue with filtered data persisting when dropdown closed

![labels](/uploads/4b9c902add76263d8488cc34ef49f142/labels.gif)

Closes #14401

See merge request !3302
2016-03-20 14:55:58 +00:00
Stan Hu 7418429da1 Move tooltip to the right of the dropdown 2016-03-20 07:52:06 -07:00
Stan Hu 91f9866cce Fix specs and remove unnecessary console.log 2016-03-20 05:53:43 -07:00
Grzegorz Bizon 797af06491 Merge branch 'master' into feature/issue-move
* master:
  Fix bug where wrong commit ID was being used in a merge request diff to show old image
  Remove CHANGELOG item that was added during merge resolution
  Improve the "easy WIP & un-WIP from link" feature
  Fix specs
  \#to_branch_name now uses the iid as postfix
  Add label description in tooltip to labels in issue index and sidebar
  Easily (un)mark merge request as WIP using link
  Use specialized system notes when MR is (un)marked as WIP
  another attempt to fix oauth issue
  attempting to fix omniauth problem

Conflicts:
	app/assets/javascripts/issuable_form.js.coffee
2016-03-20 11:01:08 +01:00
Grzegorz Bizon 6eb3105634 Find referable for each ref found in references rewriter 2016-03-20 10:52:01 +01:00
Grzegorz Bizon 323d328c86 Rename reference unfolder to rewriter, minor refactorings 2016-03-20 10:14:25 +01:00
Grzegorz Bizon 802b28e04a Add tooltip info about issue move filed purpose 2016-03-20 10:01:12 +01:00
Grzegorz Bizon f0211a4ea9 Do not pass params that are not used in issue move service 2016-03-20 09:28:06 +01:00
Stan Hu d5c071419a Use http_clone_button and ssh_clone_button to restore tooltip functionality in clone panel 2016-03-19 22:47:27 -07:00
Stan Hu 68fa4de6e3 Make HTTP(s) label consistent on clone bar
Sites that use http:// for the external_url should always display HTTP on
the clone bar. Similarly, sites that use https:// should show HTTPS.
2016-03-19 22:47:27 -07:00
Douwe Maan 01fe50a725 Merge branch 'fix-image-diff' into 'master'
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
2016-03-19 22:59:41 +00:00
Robert Speicher 085538c2bd Use the configured Kaminari "per page" default 2016-03-19 17:37:54 -04:00
Yorick Peterse fc5ff7af61 Create repositories in Spinach issues tests
Similar to ad90dba5185e30883d5ad6008c166b0df0108ebf we always have a
repository in the real world, so let's also create one in our Spinach
tests.
2016-03-19 21:54:08 +01:00
Yorick Peterse 295fdf720a Create repositories in IssuesController specs
In the real world a project always has a repository. This fact allows
code such as Issue#related_branches to work without explicitly checking
if a repository exists.
2016-03-19 21:54:08 +01:00
Yorick Peterse 68a4c98f50 Cache output of Repository#exists?
This caches the output of Repository#exists? in Redis while making sure
it's flushed properly when creating new repositories, deleting them,
etc.

For the ProjectWiki tests to work I had to make ProjectWiki#create_repo!
public as testing private methods in RSpec is a bit of a pain.
2016-03-19 21:54:08 +01:00
Yorick Peterse 41b8d22631 Tweaked performance of Issue#related_branches
Requesting the branch names of a repository works even when it's empty,
thus there's no need to explicitly check for an empty repository.
Removing this check cuts down the amount of Git operations which in turn
cuts down request timings a bit. The regular expression used to compare
branches was also moved out of the loop so it's created only once.
2016-03-19 21:54:08 +01:00
Stan Hu 79ad6e0e38 Fix bug where wrong commit ID was being used in a merge request diff to show old image
Closes #3769

Closes #14327
2016-03-19 13:28:40 -07:00
Jacob Schatz 3f22a92f4a Merge branch 'remove-wip' into 'master'
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
2016-03-19 20:06:59 +00:00
Douwe Maan afbcdd8e7f Move diff line to separate partial 2016-03-19 20:04:23 +01:00
Douwe Maan a8aa59e96e Inline mailer CSS using premailer.
# Conflicts:
#	Gemfile.lock
2016-03-19 20:04:10 +01:00
Douwe Maan 64b57ec86a Merge branch 'fix/gitlab-omniauth-issue' into 'master'
attempting to fix omniauth problem

Attempt to fix https://gitlab.com/gitlab-org/gitlab-ce/issues/3361

See merge request !2876
2016-03-19 19:03:33 +00:00