summaryrefslogtreecommitdiff
path: root/spec/services/merge_requests/conflicts
diff options
context:
space:
mode:
authorYorick Peterse <yorickpeterse@gmail.com>2018-07-06 12:16:37 +0000
committerYorick Peterse <yorickpeterse@gmail.com>2018-07-06 12:16:37 +0000
commitb62825fd8e9c2215a270675a1209442fd1d38b30 (patch)
tree5b207dc4e9aaeabfadf3c6a7df56aa7feb600405 /spec/services/merge_requests/conflicts
parent34fe32740f475051dfcbb696f11c270ae327dc4a (diff)
parent98b1f5496ce47ea09e6cc57a503995e0ceadb254 (diff)
downloadgitlab-ce-b62825fd8e9c2215a270675a1209442fd1d38b30.tar.gz
Merge branch 'blackst0ne-rails5-activerecord-statementinvalid-mysql2-error-expression-1-of-select-list-is-not-in-group-by-clause' into 'master'
[Rails5] Fix milestone GROUP BY query Closes #48428 See merge request gitlab-org/gitlab-ce!20256
Diffstat (limited to 'spec/services/merge_requests/conflicts')
0 files changed, 0 insertions, 0 deletions