summaryrefslogtreecommitdiff
path: root/lib/api/project_snippets.rb
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-05-04 13:55:00 +0000
committerRémy Coutable <remy@rymai.me>2016-05-04 13:55:00 +0000
commit275c615557595996f704c9f45b16f435fc70b8e2 (patch)
tree212b66a5c7ddd98e6feed0d522a2ed85f0186ae2 /lib/api/project_snippets.rb
parent622ad2355a5b780091def7f7752ac88c97520dbb (diff)
parent3004386b55fede6381e5e0794c12625e2b83de25 (diff)
downloadgitlab-ce-275c615557595996f704c9f45b16f435fc70b8e2.tar.gz
Merge branch 'revert-devise-async' into 'master'
Revert "Remove the Devise Async gem." This reverts commit 1cc614f2bdd30b4fce35ee9e680f9272b9012978. It was causing the ActiveJob integration to fail, so unfortunately we'll have to add the gem again. Resolves #17250. See merge request !4027
Diffstat (limited to 'lib/api/project_snippets.rb')
0 files changed, 0 insertions, 0 deletions