1. 14 Aug, 2019 32 commits
  2. 13 Aug, 2019 8 commits
    • Michael Kozono's avatar
      Merge branch 'ce-10586-add-flag-to-object-storage-migration' into 'master' · 38b0de9e
      Michael Kozono authored
      CE Migration Backport: Add flag to object storage
      
      See merge request gitlab-org/gitlab-ce!31695
      38b0de9e
    • Robert Speicher's avatar
      Merge branch '66008-fix-project-image-in-slack-notifications' into 'master' · 25cee3e0
      Robert Speicher authored
      Fix project avatar image in Slack pipeline notifications
      
      Closes #66008
      
      See merge request gitlab-org/gitlab-ce!31788
      25cee3e0
    • Stan Hu's avatar
      Merge branch 'id-source-code-smau' into 'master' · 0abe5393
      Stan Hu authored
      Add usage pings for source code pushes
      
      See merge request gitlab-org/gitlab-ce!31734
      0abe5393
    • Igor's avatar
      Add usage pings for source code pushes · 04598039
      Igor authored
      Source Code Usage Ping for Create SMAU
      04598039
    • Douglas Barbosa Alexandre's avatar
      Merge branch 'bump_helm_kubectl_gitlab' into 'master' · 383a1840
      Douglas Barbosa Alexandre authored
      Bump Helm to 2.14.3 and kubectl to 1.11.10
      
      See merge request gitlab-org/gitlab-ce!31716
      383a1840
    • Stan Hu's avatar
      Merge branch 'expand-variables-only-when-needed' into 'master' · e2361565
      Stan Hu authored
      Expand variables only when needed
      
      See merge request gitlab-org/gitlab-ce!31772
      e2361565
    • Douwe Maan's avatar
      Merge branch 'bvl-remote-mirror-exception-handling' into 'master' · f7ac4106
      Douwe Maan authored
      Rework push mirror retries
      
      See merge request gitlab-org/gitlab-ce!31247
      f7ac4106
    • Bob Van Landuyt's avatar
      Rework retry strategy for remote mirrors · 452bc36d
      Bob Van Landuyt authored
      **Prevention of running 2 simultaneous updates**
      
      Instead of using `RemoteMirror#update_status` and raise an error if
      it's already running to prevent the same mirror being updated at the
      same time we now use `Gitlab::ExclusiveLease` for that.
      
      When we fail to obtain a lease in 3 tries, 30 seconds apart, we bail
      and reschedule. We'll reschedule faster for the protected branches.
      
      If the mirror already ran since it was scheduled, the job will be
      skipped.
      
      **Error handling: Remote side**
      
      When an update fails because of a `Gitlab::Git::CommandError`, we
      won't track this error in sentry, this could be on the remote side:
      for example when branches have diverged.
      
      In this case, we'll try 3 times scheduled 1 or 5 minutes apart.
      
      In between, the mirror is marked as "to_retry", the error would be
      visible to the user when they visit the settings page.
      
      After 3 tries we'll mark the mirror as failed and notify the user.
      
      We won't track this error in sentry, as it's not likely we can help
      it.
      
      The next event that would trigger a new refresh.
      
      **Error handling: our side**
      
      If an unexpected error occurs, we mark the mirror as failed, but we'd
      still retry the job based on the regular sidekiq retries with
      backoff. Same as we used to
      
      The error would be reported in sentry, since its likely we need to do
      something about it.
      452bc36d