Commit a6ec2797 authored by Mayra Cabrera's avatar Mayra Cabrera 0️⃣
Browse files

Merge remote-tracking branch 'ce/10-6-stable-patch-1' into 10-6-stable-ee-patch-1

parents 57ff900b 5b1ed003

Gemfile

+1 −1
Original line number Diff line number Diff line
@@ -228,7 +228,7 @@ gem 'sanitize', '~> 2.0' 
gem 'babosa', '~> 1.0.2'



# Sanitizes SVG input

gem 'loofah', '~> 2.0.3'

gem 'loofah', '~> 2.2'



# Working with license

gem 'licensee', '~> 8.7.0'

Gemfile.lock

+6 −4
Original line number Diff line number Diff line
@@ -150,6 +150,7 @@ GEM 
    connection_pool (2.2.1)

    crack (0.4.3)

      safe_yaml (~> 1.0.0)

    crass (1.0.3)

    creole (0.5.0)

    css_parser (1.5.0)

      addressable
@@ -517,7 +518,8 @@ GEM 
      actionpack (>= 4, < 5.2)

      activesupport (>= 4, < 5.2)

      railties (>= 4, < 5.2)

    loofah (2.0.3)

    loofah (2.2.2)

      crass (~> 1.0.2)

      nokogiri (>= 1.5.9)

    mail (2.7.0)

      mini_mime (>= 0.1.1)
@@ -715,8 +717,8 @@ GEM 
      activesupport (>= 4.2.0.beta, < 5.0)

      nokogiri (~> 1.6)

      rails-deprecated_sanitizer (>= 1.0.1)

    rails-html-sanitizer (1.0.3)

      loofah (~> 2.0)

    rails-html-sanitizer (1.0.4)

      loofah (~> 2.2, >= 2.2.2)

    rails-i18n (4.0.9)

      i18n (~> 0.7)

      railties (~> 4.0)
@@ -1137,7 +1139,7 @@ DEPENDENCIES 
  license_finder (~> 3.1)

  licensee (~> 8.7.0)

  lograge (~> 0.5)

  loofah (~> 2.0.3)

  loofah (~> 2.2)

  mail_room (~> 0.9.1)

  method_source (~> 0.8)

  minitest (~> 5.7.0)

app/models/ci/build.rb

+6 −3
Original line number Diff line number Diff line
@@ -143,7 +143,11 @@ def retry(build, current_user) 
        next if build.retries_max.zero?



        if build.retries_count < build.retries_max

          begin

            Ci::Build.retry(build, build.user)

          rescue Gitlab::Access::AccessDeniedError => ex

            Rails.logger.error "Unable to auto-retry job #{build.id}: #{ex}"

          end

        end

      end
@@ -331,8 +335,7 @@ def old_trace 
    end



    def erase_old_trace!

      write_attribute(:trace, nil)

      save

      update_column(:trace, nil)

    end



    def needs_touch?

changelogs/unreleased/44232-docs-for-runner-ip-address.yml

0 → 100644
+5 −0
Original line number Diff line number Diff line 
---

title: Add documentation for runner IP address (#44232)

merge_request: 17837

author:

type: other

changelogs/unreleased/44587-autolinking-includes-trailing-exclamation-marks.yml

0 → 100644
+5 −0
Original line number Diff line number Diff line 
---

title: Don't capture trailing punctuation when autolinking

merge_request: 17965

author:

type: fixed