-
Merge branch 'master' into refactor/ci-config-move-job-entries · 795c9f22Grzegorz Bizon authored
* master: (321 commits) Fix the Sentry spam from CSP violations by disabling it. Limit git rev-list output count to one in forced push check Ensure Owners are included in the scope for authorized_projects Fix alignment of icons on project page Fix ci_status_helper_spec to look for new SVGs use 2.0.5, actually (2.0.4 was a bad release) upgrade rouge to 2.0.4 Fix help page paths to make sure shortcuts and the UI help page work. fixes an issue cause by a bad merge Vertically align status icon within table Add new icons for every CI status Add global style for running icon Align running icon in merge request Add new running icon; add a bunch of styles to get svg to match existing fa icons Improve code design Fix broken builds_for_ref Move when tests before to make it no conflict with manual-actions Use value of `yaml_variables` and `when` from config_processor if undefined Add CHANGELOG entry CHANGELOG item ... Conflicts: lib/ci/gitlab_ci_yaml_processor.rb spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
795c9f22
×