diff options
author | Douwe Maan <douwe@gitlab.com> | 2016-10-25 10:54:48 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2016-10-25 10:54:48 +0000 |
commit | c003fc5091231c60fb9b87c842382f6078b53613 (patch) | |
tree | 5b07ab0f0597ec8b47ca4b1fa6130e748b1412f3 /.rubocop_todo.yml | |
parent | f289983db6dd0b3d237ad35f5359ecd6e09cb3ea (diff) | |
parent | fed3f718d8e2223305fb1c0ab4e72d514f50a8f6 (diff) | |
download | gitlab-ce-c003fc5091231c60fb9b87c842382f6078b53613.tar.gz |
Merge branch '23662-issue-move-user-reference-exception' into 'master'
Fix `User#to_reference`
## What does this MR do?
Fix the method signature of `User#to_reference` so that moving an issue with a user reference does not throw a "invalid number of arguments" exception.
## Why was this MR needed?
1. Changes in 8.13 require `Referable`s that don't have a project
reference to accept two arguments - `from_project` and
`target_project`.
2. `User#to_reference` was not changed to accept the
`target_project` (even though it is not used). Moving an issue
containing a user reference would throw a "invalid number of
arguments" exception.
3. The regression was introduced in [c8b2b3f7](https://gitlab.com/gitlab-org/gitlab-ce/commit/c8b2b3f7c32db873f1bebce3e3b1847ea24d235f#91fabb7ad88bd2fde6fef1c100a719c00e503047_75_79), which expects
all `Referable`s that don't respond to `:project` to have a `to_reference`
method that takes two arguments.
## Does this MR meet the acceptance criteria?
- Tests
- [x] Added for this feature/bug
- [ ] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [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 it does - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
- Closes #23662
See merge request !7088
Diffstat (limited to '.rubocop_todo.yml')
0 files changed, 0 insertions, 0 deletions