summaryrefslogtreecommitdiff
path: root/app/models/group_label.rb
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2017-01-16 14:21:44 +0100
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2017-01-16 14:21:44 +0100
commit4657c28777dfc2729261f895f8e36cbef51395bc (patch)
tree86c2483e843be06ad10c0f0b43f6a20da3a5a6b8 /app/models/group_label.rb
parent5456859b5b28baca95ced74179a349563498a5f0 (diff)
parentdaaaf5ef9f182761ac07d76d24d971765134c7e1 (diff)
downloadgitlab-ce-4657c28777dfc2729261f895f8e36cbef51395bc.tar.gz
Merge branch 'master' into fix/keep-artifacts-button-visibilityfix/keep-artifacts-button-visibility
* master: (579 commits) Conflicts: spec/models/build_spec.rb
Diffstat (limited to 'app/models/group_label.rb')
0 files changed, 0 insertions, 0 deletions