delta/gitlab/gitlab-ce.git, branch patch/fix-mergerequest-diff

Fixed MergeRequestController spec

2016-03-30T03:02:32+00:00

We need `sha` reference from `diff_base_commit` to generate the diff

2016-03-30T02:59:51+00:00

Use `diff_base_commit` instead of `target_branch` to generate diffs

2016-03-30T02:59:51+00:00

Merge branch 'fix-mr-comment-commit-pruned' into 'master'

2016-03-29T20:25:12+00:00


Gracefully handle notes on deleted commits in merge requests

Closes #3250

See merge request !3402

Merge branch 'mariusz_jachimowicz/gitlab-ce-i_14415_expose_label_description' into 'master'

2016-03-29T20:21:16+00:00

api - expose label description

Resolves #14415

See merge request !3314

Merge branch 'fix_wip_in_mr_api' into 'master'

2016-03-29T18:49:08+00:00


Ensuring Merge Request API returns boolean values for work_in_progress

Fixes #14692.

See merge request !3432

Merge branch 'handle-nil-description-slack-message' into 'master'

2016-03-29T16:30:55+00:00


Handle nil descriptions in Slack issue messages

Closes #14676

See merge request !3420

Merge branch 'gitlab-shell-2.7' into 'master'

2016-03-29T15:56:17+00:00


Updated gitlab-shell to 2.7

This is done to include the changes introduced in
https://gitlab.com/gitlab-org/gitlab-shell/merge_requests/42.

See merge request !3437

Updated gitlab-shell to 2.7

2016-03-29T13:46:47+00:00

This is done to include the changes introduced in
https://gitlab.com/gitlab-org/gitlab-shell/merge_requests/42.

Merge branch 'rs-fix-migrations' into 'master'

2016-03-29T10:58:12+00:00


Use raw SQL instead of Rails models in migrations where appropriate

Closes #14694.

See merge request !3429