diff options
author | Kushal Pandya <kushalspandya@gmail.com> | 2017-04-06 21:12:16 +0000 |
---|---|---|
committer | Kushal Pandya <kushalspandya@gmail.com> | 2017-04-06 21:12:16 +0000 |
commit | 8a5ca1121b090fe813144adf4428e7cb656b65d3 (patch) | |
tree | 3e6777ed81c3c08bdd4abba0d00826c68e51cba9 /config/resque.yml.example | |
parent | 26a672dabc6b5217a58a2ec9b3c88e869c87c6dd (diff) | |
parent | 69bf7bfa7b1ff33a66e8b4531ce2302cebf6678b (diff) | |
download | gitlab-ce-8a5ca1121b090fe813144adf4428e7cb656b65d3.tar.gz |
Merge branch 'master' into '18471-restrict-tag-pushes-protected-tags'
# Conflicts:
# spec/lib/gitlab/import_export/all_models.yml
Diffstat (limited to 'config/resque.yml.example')
0 files changed, 0 insertions, 0 deletions