diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-05-31 21:15:40 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-05-31 21:15:40 +0000 |
| commit | eb728d37a7ed940d9d9b1f762c4ea65cc8e35a56 (patch) | |
| tree | be6524aa6298385e9bcb93789989bd225b65b043 /spec/serializers/label_serializer_spec.rb | |
| parent | 161af17c1b69e7e00aefcd4f540a55755259ceda (diff) | |
| parent | 3fc4b2c86090841d9a6245b9b73e46231610703e (diff) | |
| download | gitlab-ce-eb728d37a7ed940d9d9b1f762c4ea65cc8e35a56.tar.gz | |
Merge branch 'master' into 'trigger-source'
# Conflicts:
# db/schema.rb
Diffstat (limited to 'spec/serializers/label_serializer_spec.rb')
0 files changed, 0 insertions, 0 deletions