delta/gitlab/gitlab-ce.git/spec/services, branch patch-14

Fix access to projects shared with a nested group

2017-02-28T12:18:20+00:00

Signed-off-by: Dmitriy Zaporozhets

Merge branch 'only-create-unmergeable-todo-once' into 'master'

2017-02-28T10:45:39+00:00


Only create unmergeable todos once

Closes #28555

See merge request !9513

Include nested group into destroy_service_spec

2017-02-27T12:28:02+00:00

Signed-off-by: Dmitriy Zaporozhets

Merge branch 'dm-fix-web-edit-new-lines' into 'master'

2017-02-24T21:57:47+00:00


Consistently create, update, and delete files, taking CRLF settings into account

See merge request !9207

Only create unmergeable todos once

2017-02-24T17:18:12+00:00

Previously, we created an unmergeable todo when a merge request:

1. Had merge when pipeline succeeds set.
2. Became unmergeable.

However, when merge when pipeline succeeds fails due to unmergeability,
the flag isn't actually removed. And a merge request can become
unmergeable multiple times, as every time the target branch is updated
we need to re-check the mergeable status. This means that if the todo
was marked done, and the MR was checked again, a new todo would be
created for the same event.

Instead of checking this, we should create the todo from the service
responsible for merging when the pipeline succeeds. That way the todo is
guaranteed to only be created when we care about it.

Rename commit_file, commit_dir and remove_file and update specs

2017-02-24T15:55:01+00:00

Implement final review comments from @DouweM and @rymai

2017-02-24T11:20:20+00:00

- Have `Uniquify` take a block instead of a Proc/function. This is more
  idiomatic than passing around a function in Ruby.

- Block a user before moving their issues to the ghost user. This avoids a data
  race where an issue is created after the issues are migrated to the ghost user,
  and before the destroy takes place.

- No need to migrate issues (to the ghost user) in a transaction, because
  we're using `update_all`

- Other minor changes

Deleting a user shouldn't delete associated issues.

2017-02-24T11:20:19+00:00

- "Associated" issues are issues the user has created + issues that the
  user is assigned to.

- Issues that a user owns are transferred to a "Ghost User" (just a
  regular user with `state = 'ghost'` that is created when
  `User.ghost` is called).

- Issues that a user is assigned to are moved to the "Unassigned" state.

- Fix a spec failure in `profile_spec` — a spec was asserting that when a user
  is deleted, `User.count` decreases by 1. After this change, deleting a user
  creates (potentially) a ghost user, causing `User.count` not to change. The
  spec has been updated to look for the relevant user in the assertion.

Merge branch 'dm-meer-blauw-op-straat' into 'master'

2017-02-23T17:19:28+00:00


Enable (and disable) more RuboCops

See merge request !9432

Merge branch 'fix/gb/pipeline-retry-skipped-jobs' into 'master'

2017-02-23T17:09:27+00:00


Fix reprocessing skipped jobs when retrying pipeline

See merge request !9436