summaryrefslogtreecommitdiff
path: root/app/services/merge_requests/merge_service.rb
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-09-26 01:13:04 +0000
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-09-26 01:13:04 +0000
commit38a848be1c1ea5cba3112def8b3d64a2af056f0e (patch)
tree746706c26febac518c5c37d170fbe4200330711c /app/services/merge_requests/merge_service.rb
parent53b3ad5f7ce50bfdb1dd0c72b3cc2b020f52abe1 (diff)
parent7ab056c7d73191cbfb2ce70a2fa19aff69d11fd3 (diff)
downloadgitlab-ce-38a848be1c1ea5cba3112def8b3d64a2af056f0e.tar.gz
Merge branch '31094-define-color-priorities' into 'master'
Update color variables See merge request gitlab-org/gitlab-ce!14456
Diffstat (limited to 'app/services/merge_requests/merge_service.rb')
0 files changed, 0 insertions, 0 deletions