summaryrefslogtreecommitdiff
path: root/app/mailers
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2016-01-30 10:03:40 +0000
committerDouwe Maan <douwe@gitlab.com>2016-01-30 10:03:40 +0000
commit3d61cf9f1bfaa9d0ffd5cc36e54162c0f0b59c61 (patch)
tree09ab03799bbb10c036e623934f0a43eee2320e1e /app/mailers
parentdec21517186f7406da2efd76569b4dff4fa711e0 (diff)
parent103d67768d5dc3b3f2676d3f4bc7e2fb5581083e (diff)
downloadgitlab-ce-3d61cf9f1bfaa9d0ffd5cc36e54162c0f0b59c61.tar.gz
Merge branch 'warn-admin-oauth' into 'master'
Warn admin of granting admin rights during OAuth Fixes #3951 Warning style the same as the warning a user sees on a archived project. ![Screenshot_from_2016-01-25_20-06-33](/uploads/42e6a218b963311fd20c0b7c87c8cf4f/Screenshot_from_2016-01-25_20-06-33.png) See merge request !2601
Diffstat (limited to 'app/mailers')
0 files changed, 0 insertions, 0 deletions