delta/gitlab/gitlab-ce.git/spec/models, branch gitlab_intro_docs

Add a safeguard in MergeRequest#compute_diverged_commits_count

2016-03-18T18:01:20+00:00

We have to ensure source_sha and target_sha are not nil before calling
Gitlab::Git::Commit.between.

Refactor `Todo#target`

2016-03-18T16:27:27+00:00

Rename `Todo#to_reference` to `Todo#target_reference`

2016-03-18T16:24:47+00:00

Since we're not actually returning a todo reference.

Use `Commit#short_id` instead of `Commit.truncate_sha`

2016-03-18T14:07:30+00:00

Update schema info comment on todo related files

2016-03-18T14:00:53+00:00

Use todo.done without ! in the controller to mark todo as done

2016-03-18T14:00:53+00:00

Trigger a todo for mentions on commits page

2016-03-18T14:00:53+00:00

Merge branch 'fix-mr-source-sha' into 'master'

2016-03-18T12:28:43+00:00


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

Merge branch 'confidential-issues' into 'master'

2016-03-18T12:04:56+00:00


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

Restrict access to confidential issues on activity feed

2016-03-17T23:56:00+00:00