summaryrefslogtreecommitdiffstats
path: root/model
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2015-10-05 10:32:27 -0400
committerChristopher Speller <crspeller@gmail.com>2015-10-05 10:32:27 -0400
commit515d709c2ef13b6ed7a3d04a7ad2fb2acbb0ec5d (patch)
tree29ddc870ead72d2ed258c6411f107b55e0d3437a /model
parentf4afabd67999baabd06038cb6f3d664f2ebf77ba (diff)
parent62219273518b85f03930fc038d01b2649d1c6ba0 (diff)
downloadchat-515d709c2ef13b6ed7a3d04a7ad2fb2acbb0ec5d.tar.gz
chat-515d709c2ef13b6ed7a3d04a7ad2fb2acbb0ec5d.tar.bz2
chat-515d709c2ef13b6ed7a3d04a7ad2fb2acbb0ec5d.zip
Merge pull request #915 from mattermost/plt-300
PLT-300 Update allow/deny oauth page UI, and add ouath as reserved word.
Diffstat (limited to 'model')
-rw-r--r--model/utils.go1
1 files changed, 1 insertions, 0 deletions
diff --git a/model/utils.go b/model/utils.go
index e19cceba5..93b8c4512 100644
--- a/model/utils.go
+++ b/model/utils.go
@@ -163,6 +163,7 @@ var reservedName = []string{
"post",
"cluster",
"api",
+ "oauth",
}
var wwwStart = regexp.MustCompile(`^www`)