summaryrefslogtreecommitdiff
path: root/spec/controllers
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-10-17 11:55:55 +0000
committerDouwe Maan <douwe@gitlab.com>2015-10-17 11:55:55 +0000
commit5ad3a274b3404286bb32b695c8f2b7bdd21e4953 (patch)
tree2b3fd69c3a8cfd064d11cb90ed8e5c7a1ab6f803 /spec/controllers
parent5d010ecd8a3ed6e0a83b3c050c7bdfff833f77e1 (diff)
parent34148d15764898579cc44ea02f439e8359e01233 (diff)
downloadgitlab-ce-5ad3a274b3404286bb32b695c8f2b7bdd21e4953.tar.gz
Merge branch 'rs-redactor-filter' into 'master'
Separate rendering of Markdown reference links from redacting those the user doesn't have access to and extracting referenced objects Related: !1014 See merge request !1090
Diffstat (limited to 'spec/controllers')
0 files changed, 0 insertions, 0 deletions