delta/gitlab/gitlab-ce.git, branch edit-form-alignment

Fix spacing below edit note form

2016-03-18T17:23:54+00:00

Also changed to allow the CSS to decide what should be hidden when editting

Merge branch 'fix-mr-close-button' into 'master'

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


Fixes issue with close button not working on MR

Closes #14383

See merge request !3295

Merge branch 'improved-issue-sidebar' into 'master'

2016-03-18T13:50:22+00:00


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

Added test

2016-03-18T12:42:30+00:00

Merge branch 'docs_select_version_to_install' into 'master'

2016-03-18T12:37:59+00:00


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

Add note in rest of update guides

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

[ci skip]

Merge branch 'master' into docs_select_version_to_install

2016-03-18T12:31:33+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 'issue-fade-load' into 'master'

2016-03-18T12:25:09+00:00


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

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