delta/gitlab/gitlab-ce.git/app/models, branch patch-6

Refactor straight compare diff code

2016-10-12T13:32:57+00:00

Signed-off-by: Dmitriy Zaporozhets

Improve tests for merge request diff model

2016-10-12T13:32:57+00:00

Signed-off-by: Dmitriy Zaporozhets

Use straight diff approach when compare merge request versions

2016-10-12T13:32:57+00:00

Signed-off-by: Dmitriy Zaporozhets

Merge branch '20708-new-branch-is-immediatelly-tagged-as-merged' into 'master'

2016-10-12T10:17:35+00:00


Removes inconsistency regarding tagging immediately as merged once you create a …

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [x] API support added
- Tests
  - [x] Added for this feature/bug
  - [x] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

## What are the relevant issue numbers?


Closes #20708

See merge request !6408

Merge branch 'api-fix-project-group-sharing' into 'security'

2016-10-11T18:36:26+00:00

API: Share projects only with groups current_user can access

Aims to address the issues here: https://gitlab.com/gitlab-org/gitlab-ce/issues/23004

* Projects can be shared with non-existent groups
* Projects can be shared with groups that the current user does not have access to read

Concerns:

The new implementation of the API endpoint allows projects to be shared with a larger range of groups than can be done via the web UI.

The form for sharing a project with a group uses the following API endpoint to index the available groups: https://gitlab.com/gitlab-org/gitlab-ce/blob/494269fc92f61098ee6bd635a0426129ce2c5456/lib/api/groups.rb#L17. The groups indexed in the web form will only be those groups that the user is currently a member of.

The new implementation allows projects to be shared with any group that the authenticated user has access to view. This widens the range of groups to those that are public and internal.

See merge request !2005

Signed-off-by: Rémy Coutable

refactors tests because of gitlab-test repository changes

2016-10-11T15:33:06+00:00

Make guests unable to view MRs

2016-10-11T13:51:26+00:00

Merge branch 'sh-fix-issue-20776' into 'master'

2016-10-11T11:41:02+00:00


Fix Error 500 when viewing old merge requests with bad diff data

Customers running old versions of GitLab may have MergeRequestDiffs with the text ["--broken diff"] due to text generated by gitlab_git 1.0.3.
To avoid the Error 500, verify that each element is a type that gitlab_git will accept before attempting to create a DiffCollection.
    
Closes #20776

See merge request !6754

Merge branch 'new-gitlab-users-clear_all_authentication_tokens-task' into 'master'

2016-10-11T11:40:35+00:00


Add a new gitlab:users:clear_all_authentication_tokens task

## What are the relevant issue numbers?

Part of #22537.

See merge request !6745

Merge branch 'precalculate-trending-projects' into 'master'

2016-10-11T10:58:50+00:00


Precalculate trending projects

## What does this MR do?

This MR changes the trending projects code so that data is precalculated, removing the need for any complex caching mechanisms. 

## Why was this MR needed?

Caching of trending data didn't work properly, still leading to queries. Using caching in general would be very hard due to users being able to apply custom filters to the list of trending projects.

See merge request !6749