Commit Graph

25428 Commits

Author SHA1 Message Date
0eecc21485 Updated controller with before_action
Fixed other issues based on feedback
2016-03-18 15:18:06 +00:00
d847db79cb Fixes issue on dashboard issues
They would try to load JSON from a project even though it isn't a single project
2016-03-18 15:18:06 +00:00
645b7a0a33 Full labels data in JSON 2016-03-18 15:18:06 +00:00
0858cb097a Fixed issue with labels dropdown getting wrong labels 2016-03-18 15:18:06 +00:00
9280fd4acd 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 14:49:00 +00:00
8dfa0a7649 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 13:50:22 +00:00
195ef985f3 Added test 2016-03-18 12:42:30 +00:00
e877cfda4d 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 12:37:59 +00:00
e1ce7a47fa Add note in rest of update guides
[ci skip]
2016-03-18 14:35:04 +02:00
4d3e8ceea5 Merge branch 'master' into docs_select_version_to_install 2016-03-18 14:31:33 +02:00
dadd28e317 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 12:28:43 +00:00
f4b6a89252 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 12:25:09 +00:00
9813eac56b 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 12:04:56 +00:00
726f1efdb7 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 12:03:31 +00:00
af7850a8a3 Fix CHANGELOG by moving 8.5.5 items to 8.6
[ci skip]
2016-03-18 12:56:31 +01:00
c51af604e5 Another CS style fix 2016-03-18 11:42:15 +00:00
e8d52499db Fixed some CS styling issues
Fixed bug where wouldn't work on MR index
2016-03-18 11:42:15 +00:00
16d02de56e Fixed issue with dashboard issues not reloading 2016-03-18 11:40:16 +00:00
882ebfc296 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
2016-03-18 11:40:16 +00:00
4885423fea Fixes issue with close button not working on MR
Closes #14383
2016-03-18 11:36:48 +00:00
3f0d780c19 Show a notice for diffs that are too large
This builds on the changes introduced in
https://gitlab.com/gitlab-org/gitlab_git/merge_requests/72 and results
in merge requests with large diffs (e.g. due to them containing minified
CSS) loading much faster.
2016-03-18 12:30:46 +01:00
bdbc988434 Merge branch 'improve-diff-ui' into 'master'
Add space to separate different files in diff

I propose to add some visual separation between files in diff. Originally this separation was removed in 8.0 because of different UI layout. Now when we have white layout back I think it will be better to add some space between files. 

- - - 

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


See merge request !3275
2016-03-18 11:29:32 +00:00
bca8ea33b3 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 11:28:54 +00:00
4cd87d31bd 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 11:23:16 +00:00
ad04a91188 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 10:46:56 +00:00
fa6fae18a9 Changed any variable name to save confusion 2016-03-18 09:49:44 +00:00
72830aa809 Removed comparing against text 2016-03-18 09:48:47 +00:00
8357a23ac8 Fixes issue with any milestone value in dropdown not being selectable
Closes #14293
2016-03-18 09:48:47 +00:00
b2e673e523 Removed global JS var 2016-03-18 09:46:20 +00:00
38ea9c6cf7 Reused some variables
Set global JS variable to sync view up
2016-03-18 09:46:20 +00:00
021d79e3ac Links to user on collapsed issue sidebar 2016-03-18 09:46:20 +00:00
e0f47c3489 Fixed issue when user doesnt exist
Fixed button hover color
2016-03-18 09:46:20 +00:00
704cf9df2b Fixed tooltip issue for participants 2016-03-18 09:46:20 +00:00
3e98e5971b Improved issue sidebar
Updated the spacing throughout the sidebar so that it fits better on smaller screens
Added more participants button

Closes #13353
2016-03-18 09:46:20 +00:00
fde975facc 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 08:46:57 +00:00
8edb133f7b 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 07:44:47 +00:00
18c2b1983a Merge branch 'ci-duplication' into 'master'
Remove CI duplication.



See merge request !3290
2016-03-18 06:51:30 +00:00
4eb9711b46 Remove CI duplication. 2016-03-17 21:52:34 -07:00
fc75de7dc2 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 01:27:52 +00:00
4c517ce6dc 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 01:21:07 +00:00
0901d51724 Improve award emoji test reliability by checking that the emoji is displayed
before the search field is focused
2016-03-17 17:34:15 -07:00
5ed7e2cfd5 Update CHANGELOG 2016-03-17 20:56:00 -03:00
9222459ea3 Restrict access to confidential issues on activity feed 2016-03-17 20:56:00 -03:00
7d403ec46f Add eye-slash icon to confidential issues 2016-03-17 20:56:00 -03:00
482bfd1a6d Restrict access for confidential issues on milestone view 2016-03-17 20:55:59 -03:00
1029f4101b Fix issues count on project view 2016-03-17 20:55:59 -03:00
f2ba4e3d36 Restrict access to confidential issues on search results 2016-03-17 20:55:59 -03:00
e4f1c001e6 Restrict access to confidential issues through API 2016-03-17 20:55:59 -03:00
7ee528336a Restrict access for confidential issues on autocomplete 2016-03-17 20:55:59 -03:00
43d8bdb4f0 Restrict access to references for confidential issues 2016-03-17 20:55:59 -03:00