1. 20 Jul, 2016 4 commits
    • Grzegorz Bizon's avatar
      Merge branch 'master' into refactor/ci-config-move-job-entries · 795c9f22
      Grzegorz 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
    • Stan Hu's avatar
      Merge branch 'remove-csp-sentry-reporting' into 'master' · 79b02e40
      Stan Hu authored
      Fix the Sentry spam from CSP violations by disabling it.
      
      ## What does this MR do?
      
      Leaves CSP enabled, but without a reporting endpoint for now. This was causing a huge amount of useless errors in our Sentry instance.
      
      cc: @stanhu 
      
      See merge request !5354
      79b02e40
    • Connor Shea's avatar
      38577d68
    • Jacob Schatz's avatar
      Merge branch 'wiki-gfm-autocomplete' into 'master' · f2cd21e8
      Jacob Schatz authored
      Fixed GFM autocomplete not loading on wiki pages
      
      ## What does this MR do?
      
      Allows the GFM autocomplete to work on wiki pages.
      
      ## What are the relevant issue numbers?
      
      Closes #19580 
      
      See merge request !5132
      f2cd21e8
  2. 19 Jul, 2016 36 commits