Commit Graph
25404 Commits
Author SHA1 Message Date
Douwe MaanandRémy Coutable d0a7dfd66d Merge branch '2489-soft-delete-issues' into 'master'
Soft delete issuables

Fixes #2489 

What still needs to happen: research on the indexes, the gem suggests a [lot of changes](https://github.com/rubysherpas/paranoia#about-indexes) though this is probably a good idea to discuss and I'm unsure on the impact of an omnibus upgrade as I suspect creating about 10 new indexes has a large impact on the downtime.

TODO: 
- [x] Also group owners can ***soft*** delete
- [x] Button should be hidden

See merge request !2982
2016-03-22 12:36:02 +01:00
Douwe MaanandRémy Coutable 4999495705 Merge branch 'fix/safe-import-url' into 'master'
Prevent tokens in the import URL to be showed by the UI

Quick fix to prevent the import URL to show a user's token.

See merge request !3331
2016-03-22 12:34:38 +01:00
Kamil TrzcińskiandRémy Coutable 0fcea6b660 Merge branch 'feature-ci-only-except-trigger' into 'master'
CI: Add 'triggers' keyword to 'only' and 'except' lists to allow control over when triggers cause builds to run

Currently, the `only` and `except` keywords in `.gitlab-ci.yml` only accept ref names or the special `branches` and `tags` keywords. However, these are primarily useful when controlling how repository activity affects the creation of builds. In my case, instead of building on every commit, I'd like to use the following logic:

- If the repository is tagged, do a build.
- Any other normal commits should not cause a build.
- If a build is triggered via the API, always create one for the specified ref.

From what I can tell, this isn't possible via the existing YAML syntax. In this MR, I introduce a new keyword `triggers` that goes along with `branches` and `tags`. I can implement the logic above using the following job configuration:

```yaml
only:
  - tags
  - triggers
```

I updated the tests and documentation to reflect this and everything seems to pass.

See merge request !3230
2016-03-22 12:34:20 +01:00
Jacob SchatzandRémy Coutable 9684d7fd99 Merge branch 'css-indentation' into 'master'
Fix Indentation lints in CSS.

As discussed in #14299.

cc: @jschatz1 

See merge request !3312
2016-03-22 12:34:01 +01:00
Jacob SchatzandRémy Coutable 067539807d Merge branch 'ssh-page-ago' into 'master'
Remove duplicated ago

Closes #14460 

See merge request !3332
2016-03-22 12:33:42 +01:00
Jacob SchatzandRémy Coutable 6ecabcbe95 Merge branch 'project-icon' into 'master'
Changing project icon

Closes #14196

See merge request !3268
2016-03-22 12:33:28 +01:00
Jacob SchatzandRémy Coutable 6e46c56b12 Merge branch 'css-shorthand' into 'master'
Follow the CSS Style Guide rules for using shorthand where possible.

Fixes violations of the Shorthand rule. All of these were done manually and I reviewed each change to verify, so they should all be right.

Discussed in #14299.

cc: @jschatz1 

See merge request !3313
2016-03-22 12:32:46 +01:00
Robert SpeicherandRobert Speicher 534148e965 Merge branch 'issue_12658' into 'master'
Check if index exists before adding it

I got an error when updating GDK because it already exists.

[ci skip]

See merge request !3335
2016-03-21 22:40:56 -04:00
Robert SpeicherandRobert Speicher c8cc1c16d1 Merge branch 'issue_12658' into 'master'
Add group visibility level

Supersedes https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3051

Closes #12658

See merge request !3323
2016-03-21 21:37:57 -04:00
Rémy Coutable 939f306ab4 Version 8.6.0-rc5 v8.6.0-rc5 2016-03-21 17:46:30 +01:00
Dmitriy ZaporozhetsandRémy Coutable 834dae6f64 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 16:41:30 +01:00
Rémy Coutable c5e015e972 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 16:41:12 +01:00
Robert SpeicherandRémy Coutable b881282486 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 16:40:54 +01:00
Kamil TrzcińskiandRémy Coutable ab3681d149 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 16:40:17 +01:00
Robert SpeicherandRémy Coutable c7f3bee7ff Merge branch 'no-gc-retry' into 'master'
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
2016-03-21 12:37:20 +01:00
Douwe MaanandRémy Coutable d22c1069d3 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-21 12:37:02 +01:00
Jacob SchatzandRémy Coutable a2484ae052 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-21 12:36:46 +01:00
Douwe MaanandRémy Coutable 21e54d947d 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-21 12:33:06 +01:00
Jacob SchatzandRémy Coutable 42c4304133 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-21 12:31:20 +01:00
Rémy Coutable e6961c4681 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 12:30:58 +01:00
Jacob SchatzandRémy Coutable aadbe61022 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-21 12:30:45 +01:00
Douwe MaanandRémy Coutable a4e19b6cb0 Merge branch 'issue-branch-iid-postfix' into 'master'
#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
2016-03-21 12:30:29 +01:00
Robert SpeicherandRémy Coutable 8b90b1f3d4 Merge branch 'fix/14418' into 'master'
Dedupe labels in labels selector in Dashboard pages

Fixes #14418.

See merge request !3311
2016-03-21 12:29:58 +01:00
Jacob SchatzandRémy Coutable e0d4744a31 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-21 12:29:43 +01:00
Jacob SchatzandRémy Coutable 726242c29d 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-21 12:29:25 +01:00
Douwe MaanandRémy Coutable 2b07702ad5 Merge branch 'label-tooltip' into 'master'
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
2016-03-21 12:28:57 +01:00
Achilleas PipinellisandRémy Coutable dd2b4d7bc5 Merge branch 'master' into 'master'
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
2016-03-21 12:28:43 +01:00
Douwe MaanandRémy Coutable 1793a65eeb Merge branch 'trigger-todo-for-mentions-on-commits-page' into 'master'
Trigger a todo for mentions on commits page

Closes #14006 

* Screenshot:

![todo-commit](/uploads/5d34de0b7afcea7548123dafddf60c45/todo-commit.png)

See merge request !3262
2016-03-18 21:23:11 +01:00
Jacob SchatzandRémy Coutable 17d40eab7f Merge branch 'optimistic-todos' into 'master'
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
2016-03-18 21:22:52 +01:00
Douwe MaanandRémy Coutable 17418461ba Merge branch 'fix/14388' into 'master'
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
2016-03-18 21:22:41 +01:00
Douwe MaanandRémy Coutable 5b82e15bbc Merge branch 'fix-mr-source-sha' into 'master'
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
2016-03-18 21:22:25 +01:00
Jacob VosmaerandRémy Coutable ddb2de0957 Merge branch 'project-cache-worker-without-diverging' into 'master'
Removed diverging commit count calculation from Repository#build_cache

Using a repository with 1000 branches the old `Repository#build_cache` method would take around 180 seconds to complete. Without calculating the diverging commit counts this method "only" takes around 60 seconds. 

See commit 28cc2413eb5ddf920ce0b5eed803121f8b884754 for more details. This fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/14058

cc @rspeicher 

See merge request !3274
2016-03-18 21:21:58 +01:00
Jacob SchatzandRémy Coutable c85085b757 Merge branch 'add_avatar_to_issue_mr_header' into 'master'
Add avatar to issue and MR pages header

closes #14395
# For Issues

### Before
![Screen_Shot_2016-03-18_at_4.27.25_PM](/uploads/b097c8e304c9737e2f46ee25667829bf/Screen_Shot_2016-03-18_at_4.27.25_PM.png)

### After
![Screen_Shot_2016-03-18_at_4.22.10_PM](/uploads/f7d2b12c9455950c2e660b33e27c1827/Screen_Shot_2016-03-18_at_4.22.10_PM.png)

# For Merge Request

### Before
![Screen_Shot_2016-03-18_at_4.27.09_PM](/uploads/50c7b6ee346f749f448647004ae6031b/Screen_Shot_2016-03-18_at_4.27.09_PM.png)

### After
![Screen_Shot_2016-03-18_at_4.24.17_PM](/uploads/abd37ccf030e0b6d10521a6937206de6/Screen_Shot_2016-03-18_at_4.24.17_PM.png)

See merge request !3301
2016-03-18 21:21:41 +01:00
Jacob SchatzandRémy Coutable 56949f5e69 Merge branch 'fix-any-milestone-value' into 'master'
Fixes issue with any milestone value in dropdown not being selectable

Closes #14293

See merge request !3234
2016-03-18 21:19:35 +01:00
Robert SpeicherandRémy Coutable 915edceef4 Merge branch 'filter-label-missing' into 'master'
Fixes issue with filter label missing on labels & milestones

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14407

See merge request !3297
2016-03-18 21:18:27 +01:00
Jacob SchatzandRémy Coutable ece28bda7c Merge branch 'issue-fade-load' into 'master'
Changing filter dropdowns shows loading

Instead of doing a full refresh of the page - i've modified the filterResults method on the Issues object to work for this form as well

![issues](/uploads/3335f09f7df88b6d419de7fd3d6857d2/issues.gif)

Closes #14359

See merge request !3237
2016-03-18 21:18:20 +01:00
Douwe MaanandRémy Coutable cf52a9b435 Merge branch 'confidential-issues' into 'master'
Add confidential issues

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/3678

More information: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/227

See merge request !3282
2016-03-18 21:03:39 +01:00
Robert SpeicherandRémy Coutable 4d48c6076e Merge branch 'rs-issue-14259' into 'master'
Prevent a 500 when a repository's root_ref is nil

Closes #14259

See merge request !3278
2016-03-18 21:00:52 +01:00
Jacob SchatzandRémy Coutable f6f949f4d1 Merge branch 'improved-issue-sidebar' into 'master'
Improved issue sidebar

Updated the spacing throughout the sidebar so that it fits better on smaller screens. Also adds a more participants button to show any other participants after the first row.

Closes #13353

See merge request !3097
2016-03-18 21:00:41 +01:00
Robert SpeicherandRémy Coutable 1dc218ed76 Merge branch 'dashboard-labels' into 'master'
Dashboard labels

Previously because there were no JSON endpoint for labels or milestones
it was fetching HTML and parsing that. This is wrong.

It now fetches from a JSON endpoint.

This also fixes the dashboard/issues page not loading labels or
milestones as the path used to be only for a single project. So instead
I have created a endpoint for labels & milestones JSON on dashboard.

See merge request !3253
2016-03-18 20:57:37 +01:00
Jacob SchatzandRémy Coutable 383b9f1ec9 Merge branch 'fix-mr-close-button' into 'master'
Fixes issue with close button not working on MR

Closes #14383

See merge request !3295
2016-03-18 20:32:21 +01:00
Achilleas PipinellisandRémy Coutable dc0b12dc59 Merge branch 'docs_select_version_to_install' into 'master'
Add note in upgrade guide to choose the correct version tag

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/3448

@rspeicher I'm assigning to you since as a release manager you should know better. Let's keep it in this guide for now and then start copying it in the future ones.

See merge request !2284
2016-03-18 20:32:10 +01:00
Jacob VosmaerandRémy Coutable f14ee2f248 Merge branch 'hide-large-diffs' into 'master'
Show a notice for diffs that are empty/too large

This builds upon https://gitlab.com/gitlab-org/gitlab_git/merge_requests/72 but will fail until said MR has been merged.

Fixes gitlab-org/gitlab-ce#13912, gitlab-org/gitlab-ce#13644, gitlab-org/gitlab-ce#13557, gitlab-org/gitlab-ce#13267, gitlab-org/gitlab-ce#3906

See merge request !3185
2016-03-18 20:31:56 +01:00
Rémy Coutable 89f7eec178 Fix CHANGELOG by moving 8.5.5 items to 8.6
[ci skip]
2016-03-18 12:55:35 +01:00
Rémy Coutable b6a1d262ea Version 8.6.0-rc4 v8.6.0-rc4 2016-03-18 10:14:56 +01:00
Dmitriy ZaporozhetsandRémy Coutable 75cc6a3c4a Merge branch 'fix-group-members-ui' into 'master'
Add side padding to content-list if inside panel

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Fixes #14367, #14349

See merge request !3273
2016-03-18 09:53:26 +01:00
Achilleas PipinellisandRémy Coutable 7847cdbc3e Merge branch 'fix-issue-14338' into 'master'
Use relative links in `doc`, fix broken generated HTML links

Links like (doc/web_hooks/web_hooks.md) work in the GitLab source code
web interface, but the HTML generator produces broken links in the `doc`
subdirectories:  
http://doc.gitlab.com/ce/hooks/doc/web_hooks/web_hooks.html  
instead of the right one  
http://doc.gitlab.com/ce/web_hooks/web_hooks.html  
in  
http://doc.gitlab.com/ce/hooks/custom_hooks.html.

Fixes #14338 


See merge request !3261
2016-03-18 09:53:11 +01:00
Achilleas PipinellisandRémy Coutable fc8894b635 Merge branch 'ci-duplication' into 'master'
Remove CI duplication.



See merge request !3290
2016-03-18 09:52:55 +01:00
Robert SpeicherandRémy Coutable 7e1ccb5c84 Merge branch 'improve-award-emoji-spinach-tests' into 'master'
Improve award emoji test reliability by checking that the emoji is displayed before the search field is focused

See merge request !3288
2016-03-18 09:52:35 +01:00
Robert SpeicherandRémy Coutable 51a4c597ff Merge branch 'issue_14374' into 'master'
Check push permissions only when pushing directly to target branch.

Fixes #14374 

See merge request !3280
2016-03-18 09:52:17 +01:00