summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2017-11-27 20:39:18 +0000
committerRobert Speicher <robert@gitlab.com>2017-11-27 20:39:18 +0000
commit8e7e2aeb4f0f9e1e61366a62e41fd15936593cfd (patch)
treec7c154d99d206581b61dfd214d73c5986c338355 /app/assets
parent04ceeac1f6c56f1c1f3faa9da6e8bc563b6c1393 (diff)
parent359f41fad1d3490191c9efa3a208cf07ea924835 (diff)
downloadgitlab-ce-8e7e2aeb4f0f9e1e61366a62e41fd15936593cfd.tar.gz
Merge branch 'pawel/update_prometheus_gem_to_fix_build_on_Rpi' into 'master'
Update prometheus gem to fix build on RPi Closes omnibus-gitlab#2988 See merge request gitlab-org/gitlab-ce!15616
Diffstat (limited to 'app/assets')
0 files changed, 0 insertions, 0 deletions