Commit Graph

3 Commits

Author SHA1 Message Date
Heinrich Lee Yu aeb67dd489 Upgrade to Rails 5.2
Updates changed method names and fixes spec failures
2019-07-12 10:15:31 +08:00
Stan Hu b7b852c250 Additional fix to handle NULL lock_version
If the UI sends a string value for lock_version (e.g. "0"), then the
previous monkey patch did not properly handle that properly. This
commit casts the value to an integer to determine whether to look for
NULL lock_versions.

For merge requests, GitLab sends a POST request to
`namespace/project/merge_requests/:iid` with the
`merge_request[lock_version]` parameter with a string `0`. The string
value comes from the form field, which explains why
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/28145 wasn't
sufficient.
2019-05-06 21:21:56 -07:00
Sean McGivern 835c616b12 Fix editing issues and MRs with NULL lock_version 2019-05-06 20:24:23 +00:00