delta/gitlab/gitlab-ce.git/spec/controllers, branch ref-dropdown-jquery-objects

Merge branch '18755-fix-destroy-project-causes-post_decline_request-to-be-executed' into 'master'

2016-06-22T01:15:29+00:00


Resolve "Destroying a project causes post_decline_request to be executed"

## What does this MR do?

Ensure we don't send "access request declined" to access requesters when a project is deleted.

## Are there points in the code the reviewer needs to double check?

I've created a service to decouple the notification sending from the AR model.

## Why was this MR needed?

Because there was an issue.

## What are the relevant issue numbers?

Fixes #18755, #18750.

## Does this MR meet the acceptance criteria?

- [x] No CHANGELOG needed.
- [x] Tests
  - [x] Added for this feature/bug
  - [x] All builds are passing
- [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)

See merge request !4744

Fixed issue with returning ref in commits JSON

2016-06-20T10:37:27+00:00

Added tests to project controller

Fix and remove duplicate specs

2016-06-20T10:36:59+00:00

Signed-off-by: Rémy Coutable

Redirect to the member's source on request withdrawal

2016-06-18T03:46:45+00:00

Signed-off-by: Rémy Coutable

Merge branch 'issue_12758' into 'master'

2016-06-17T23:28:22+00:00


Implement custom notification level options

![Screen_Shot_2016-06-17_at_15.31.43](/uploads/3fc47d2f461b3e8b67bb8acaa304cf99/Screen_Shot_2016-06-17_at_15.31.43.png)

![Screenshot_from_2016-06-15_10-52-27](/uploads/88dbdd21d97e80ee772fe08fa0c9b393/Screenshot_from_2016-06-15_10-52-27.png)

part of #12758 

See merge request !4389

Merge branch 'issuable-todo-improvements'

2016-06-17T22:42:36+00:00

# Conflicts:
#	app/controllers/projects/todos_controller.rb

Merge branch 'disable-saml-account-unlink' into 'master'

2016-06-17T19:27:51+00:00


Disable the unlink feature for SAML connected accounts (social login).

This disables the ability to manually unlink your SAML account, if you have one connected. In certain scenarios, the only allowed login mechanism can be SAML, and if you unlink your account you will be locked out of the system (configuration dependent).

Fixes #18613

See merge request !4662

Removed update method

2016-06-17T17:31:37+00:00

Re-structured controller spec
Renamed issuable param to issuable_id

Merge master into issue_12758

2016-06-17T17:29:11+00:00

Added todo controller tests for merge requests

2016-06-17T08:13:21+00:00