summaryrefslogtreecommitdiff
path: root/app/controllers/oauth
diff options
context:
space:
mode:
authorJames Lopez <james@jameslopez.es>2016-02-19 09:03:13 +0100
committerJames Lopez <james@jameslopez.es>2016-02-19 09:03:13 +0100
commit097b635b49e50b459509213e38e417215c50b878 (patch)
tree045142693fa7b89c86f954efe4f212dde860f0df /app/controllers/oauth
parent9597920c6371db5555415705643ad26026d198fb (diff)
parentcb0b7de48267abee85d39571ae55a0e988cc21eb (diff)
downloadgitlab-ce-097b635b49e50b459509213e38e417215c50b878.tar.gz
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/gitlab-omniauth-issue
Diffstat (limited to 'app/controllers/oauth')
0 files changed, 0 insertions, 0 deletions