summaryrefslogtreecommitdiff
path: root/spec/models/project_wiki_spec.rb
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2019-02-06 00:36:16 +0000
committerStan Hu <stanhu@gmail.com>2019-02-06 00:36:16 +0000
commitd8e24e9d3896443e4b46c99a9b61a59d2a1acb2e (patch)
tree54bc209ecb5f95531d6ae11d435b89878fa9c128 /spec/models/project_wiki_spec.rb
parentea525bdbfa788d4ba105d2a4f82cca3bb656f370 (diff)
parent93dc34998182b3504145038e9cd3aeecf29e8ba4 (diff)
downloadgitlab-ce-d8e24e9d3896443e4b46c99a9b61a59d2a1acb2e.tar.gz
Merge branch 'merge-dev-into-master' into 'master'
Merge dev.gitlab.org master into GitLab.com master Closes #54721, #56663, #2779, #2776, #2772, #2783, #2766, #2784, #2760, #2775, #2777, #2767, #2786, #2780, and #56860 See merge request gitlab-org/gitlab-ce!24935
Diffstat (limited to 'spec/models/project_wiki_spec.rb')
0 files changed, 0 insertions, 0 deletions