Commit Graph
25413 Commits
Author SHA1 Message Date
Achilleas Pipinellis e1ce7a47fa Add note in rest of update guides
[ci skip]
2016-03-18 14:35:04 +02:00
Achilleas Pipinellis 4d3e8ceea5 Merge branch 'master' into docs_select_version_to_install 2016-03-18 14:31:33 +02:00
Douwe Maan 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
Jacob Schatz 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
Douwe Maan 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
Jacob Vosmaer 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
Rémy Coutable af7850a8a3 Fix CHANGELOG by moving 8.5.5 items to 8.6
[ci skip]
2016-03-18 12:56:31 +01:00
Phil Hughes c51af604e5 Another CS style fix 2016-03-18 11:42:15 +00:00
Phil Hughes e8d52499db Fixed some CS styling issues
Fixed bug where wouldn't work on MR index
2016-03-18 11:42:15 +00:00
Phil Hughes 16d02de56e Fixed issue with dashboard issues not reloading 2016-03-18 11:40:16 +00:00
Phil Hughes 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
Yorick Peterse 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
Jacob Schatz 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
Jacob Vosmaer 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
Jacob Schatz 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
Jacob Schatz 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
Phil Hughes fa6fae18a9 Changed any variable name to save confusion 2016-03-18 09:49:44 +00:00
Phil Hughes 72830aa809 Removed comparing against text 2016-03-18 09:48:47 +00:00
Phil Hughes 8357a23ac8 Fixes issue with any milestone value in dropdown not being selectable
Closes #14293
2016-03-18 09:48:47 +00:00
Dmitriy Zaporozhets 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
Achilleas Pipinellis 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
Achilleas Pipinellis 18c2b1983a Merge branch 'ci-duplication' into 'master'
Remove CI duplication.



See merge request !3290
2016-03-18 06:51:30 +00:00
Sytse Sijbrandij 4eb9711b46 Remove CI duplication. 2016-03-17 21:52:34 -07:00
Robert Speicher 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
Robert Speicher 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
Stan Hu 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
Douglas Barbosa Alexandre 5ed7e2cfd5 Update CHANGELOG 2016-03-17 20:56:00 -03:00
Douglas Barbosa Alexandre 9222459ea3 Restrict access to confidential issues on activity feed 2016-03-17 20:56:00 -03:00
Douglas Barbosa Alexandre 7d403ec46f Add eye-slash icon to confidential issues 2016-03-17 20:56:00 -03:00
Douglas Barbosa Alexandre 482bfd1a6d Restrict access for confidential issues on milestone view 2016-03-17 20:55:59 -03:00
Douglas Barbosa Alexandre 1029f4101b Fix issues count on project view 2016-03-17 20:55:59 -03:00
Douglas Barbosa Alexandre f2ba4e3d36 Restrict access to confidential issues on search results 2016-03-17 20:55:59 -03:00
Douglas Barbosa Alexandre e4f1c001e6 Restrict access to confidential issues through API 2016-03-17 20:55:59 -03:00
Douglas Barbosa Alexandre 7ee528336a Restrict access for confidential issues on autocomplete 2016-03-17 20:55:59 -03:00
Douglas Barbosa Alexandre 43d8bdb4f0 Restrict access to references for confidential issues 2016-03-17 20:55:59 -03:00
Douglas Barbosa Alexandre 34ee75379c Restrict access to confidential issues 2016-03-17 20:55:38 -03:00
Douglas Barbosa Alexandre 6b86d3fb80 Add an option to user make an issue confidential 2016-03-17 20:55:38 -03:00
Douglas Barbosa Alexandre abb77d0f6c Add a confidential flag to issues 2016-03-17 20:55:38 -03:00
Jacob Schatz abaf7ed2e5 Merge branch 'fix_dropdown_getting_cut_off_in_page' into 'master'
Fix bug causing dropdown to get cut off in project page

closes #14336 

### Before
![Screen_Shot_2016-03-16_at_11.30.40_PM](/uploads/9f8dd10f0627cdfbd49d7127b233b105/Screen_Shot_2016-03-16_at_11.30.40_PM.png)

![Screen_Shot_2016-03-16_at_11.30.53_PM](/uploads/6dfe64d68867d158a11be7e74cbd1520/Screen_Shot_2016-03-16_at_11.30.53_PM.png)


### After
![Screen_Shot_2016-03-16_at_11.30.14_PM](/uploads/2b87cc17522e8a425a97a78b36982873/Screen_Shot_2016-03-16_at_11.30.14_PM.png)

See merge request !3257
2016-03-17 23:13:48 +00:00
Jacob Schatz 09a32fa886 Merge branch 'fix_issue_mr_page_inconsistency' into 'master'
Fix inconsistency in the header of issue and merge request pages

closes #13550 

# For Issue Page

### Before
![Screen_Shot_2016-03-17_at_8.46.59_PM](/uploads/ede7f2b98395362ae87e6258cc10520a/Screen_Shot_2016-03-17_at_8.46.59_PM.png)

### After
![Screen_Shot_2016-03-17_at_8.48.56_PM](/uploads/da7adf17cb397ddc0677a6a5e8033b8e/Screen_Shot_2016-03-17_at_8.48.56_PM.png)

# For Merge request Page

### Before
![Screen_Shot_2016-03-17_at_8.45.45_PM](/uploads/10137827c05c8166a0aa429687e50d1b/Screen_Shot_2016-03-17_at_8.45.45_PM.png)

### After
![Screen_Shot_2016-03-17_at_8.45.01_PM](/uploads/92151c03cfe29b71090a1e0ad31abd6e/Screen_Shot_2016-03-17_at_8.45.01_PM.png)


See merge request !3279
2016-03-17 22:58:37 +00:00
Jacob Schatz 73ba88b539 Merge branch 'download-dropdown-alignment' into 'master'
Fixed alignment of download dropdown

With the new dropdown CSS - some dropdowns might look a bit odd

## Previously

![Screen_Shot_2016-03-16_at_11.46.04](/uploads/c1a8fc95ed4410de35d7bd5caedf28f5/Screen_Shot_2016-03-16_at_11.46.04.png)

## Now

![Screen_Shot_2016-03-16_at_11.45.26](/uploads/998637fe0872b2e826a8c17d183499dc/Screen_Shot_2016-03-16_at_11.45.26.png)

See merge request !3245
2016-03-17 21:47:03 +00:00
Jacob Schatz 1ffb32ed61 Merge branch 'filter-spacing' into 'master'
Fixed filter spacing

Closes #14350

![Screen_Shot_2016-03-17_at_10.21.33](/uploads/5b8f39134cc90ce1dd6565f665a39838/Screen_Shot_2016-03-17_at_10.21.33.png)

See merge request !3267
2016-03-17 21:45:08 +00:00
Robert Speicher 7562375e6f Merge branch 'git-2-7-4' into 'master'
Bump Git version requirement to 2.7.4

[ci skip]

See merge request !3281
2016-03-17 21:42:35 +00:00
Arinde Eniola 613e0bc541 Fix inconsistency in the header of issue and merge request pages 2016-03-17 22:34:42 +01:00
Douwe Maan 5833ae0c5e Merge branch 'master' into git-2-7-4 2016-03-17 22:23:31 +01:00
Douwe Maan 515dd63d65 Bump Git version requirement to 2.7.4 2016-03-17 22:21:10 +01:00
Yorick Peterse dd4b789765 Added tests for Repository#build_cache 2016-03-17 21:45:43 +01:00
Yorick Peterse 3d7feeede3 Don't rebuild diverging commit count caches
When calling Repository#build_cache we _don't_ want to build the
diverging commit count cache as doing so can be _very_ slow for
repositories with lots of branches. Because these caches are built
whenever needed (= when actually viewing the list of branches in the web
UI) we can safely remove this code from
Repository#build_cache.
2016-03-17 21:43:38 +01:00
Yorick Peterse 81d191ede9 Removed Repository#rebuild_cache
This method is not used or tested anywhere.
2016-03-17 21:43:38 +01:00
Robert Speicher dc396d0fa4 Merge branch 'edited-text' into 'master'
Edited timeago text on comments

Unified the 'edited text' to be the same in descriptions and comments

Closes #5538 

See merge request !3063
2016-03-17 20:35:06 +00:00