summaryrefslogtreecommitdiff
path: root/spec/services/merge_requests/ff_merge_service_spec.rb
Commit message (Collapse)AuthorAgeFilesLines
* Add frozen_string_literal to spec/servicesfrozen_string_literal_spec_servicesThong Kuah2019-04-121-0/+2
| | | | Probably useful as we often move these files to "new" files.
* [CE] Support multiple assignees for merge requestsosw-multi-assignees-merge-requestsOswaldo Ferreira2019-04-081-1/+1
| | | | | Backports https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/10161 (code out of ee/ folder).
* Allow custom hooks errors to appear in GitLab UILuke Duncalfe2019-03-261-1/+1
| | | | | | | | | | | | | | | | | | Error messages from custom pre-receive hooks now appear in the GitLab UI. This is re-enabling a feature that had been disabled in merge request https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/18646 The feature had been disabled due to security concerns that information which was not intended to be public (like stack traces) would leak into public view. PreReceiveErrors (from pre-receive, post-receive and update custom hooks) are now filtered for messages that have been prefixed in a particular way. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/48132
* Resolve "Rename the `Master` role to `Maintainer`" BackendMark Chao2018-07-111-1/+1
|
* Don't use Gitlab::Utils.nlbr in Gitlab::GitJacob Vosmaer (GitLab)2018-06-111-1/+1
|
* Make user/author use project.creator in most factoriesRémy Coutable2018-01-311-1/+2
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Replace '.team << [user, role]' with 'add_role(user)' in specs36782-replace-team-user-role-with-add_role-user-in-specsblackst0ne2017-12-221-2/+2
|
* Add spec for FfMergeServiceValery Sizov2017-09-191-0/+84