delta/gitlab/gitlab-ce.git/spec/services, branch compare-code-view

Revert "Merge branch '18193-developers-can-merge' into 'master' "

2016-07-13T18:57:30+00:00

This reverts commit 9ca633eb4c62231e4ddff5466c723cf8e2bdb25d, reversing
changes made to fb229bbf7970ba908962b837b270adf56f14098f.

Implement last round of review comments from !4892.

2016-07-13T08:48:05+00:00

1. Fix typos, minor styling errors.

2. Use single quotes rather than double quotes in `user_access_spec`.

3. Test formatting.

Enforce "developers can merge" during `pre-receive`.

2016-07-13T07:54:56+00:00

1. When a merge request is being merged, save the merge commit SHA in
   the `in_progress_merge_commit_sha` database column.

2. The `pre-receive` hook looks for any locked (in progress) merge
   request with `in_progress_merge_commit_sha` matching the `newrev` it
   is passed.

3. If it finds a matching MR, the merge is legitimate.

4. Update `git_access_spec` to test the behaviour we added here. Also
   refactored this spec a bit to make it easier to add more contexts / conditions.

Added "developers can merge" setting to protected branches

2016-07-13T07:54:26+00:00

- Cherry-picked from `mvestergaard:branch-protection-dev-merge`
- https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4220

Avoid `describe`-ing symbols in specs

2016-07-12T15:27:58+00:00

Reset project pushes_since_gc when we enqueue the git gc call

2016-07-12T13:54:05+00:00

Expire the branch cache after `git gc` runs

2016-07-12T12:42:19+00:00

Due to a stale NFS cache, it's possible that a branch lookup fails
while `git gc` is running and causes missing branches in merge requests.

Possible workaround for #15392

Allow SentNotification#position to be set as string or hash

2016-07-11T17:21:05+00:00

Add comment with diff to DiffPositionUpdateService spec

2016-07-07T20:14:57+00:00

Add tests for DiffPositionUpdateService

2016-07-06T22:51:01+00:00