diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-30 18:12:04 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-30 18:12:04 +0300 |
| commit | 93501e7509fb61b25f091d81381d3e86842a9cdd (patch) | |
| tree | e11e5528450c3e3815f59c13d8799722d8d754c1 /.gitlab | |
| parent | bfa1adf9773ba7ea7cde546ea545b72721d36faa (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/ci/rules.gitlab-ci.yml | 1 | ||||
| -rw-r--r-- | .gitlab/issue_templates/Geo Replicate a new Git repository type.md | 1 | ||||
| -rw-r--r-- | .gitlab/issue_templates/Geo Replicate a new blob type.md | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml index cdb455c8c31..d8162d108ba 100644 --- a/.gitlab/ci/rules.gitlab-ci.yml +++ b/.gitlab/ci/rules.gitlab-ci.yml @@ -283,6 +283,7 @@ # This list should match the list in Tasks::Gitlab::Assets.assets_impacting_compilation .assets-compilation-patterns: &assets-compilation-patterns - "{package.json,yarn.lock}" + - "{Gemfile,Gemfile.lock}" - ".browserslistrc" - "babel.config.js" - "config/webpack.config.js" diff --git a/.gitlab/issue_templates/Geo Replicate a new Git repository type.md b/.gitlab/issue_templates/Geo Replicate a new Git repository type.md index c33e5f8eb68..60b091b04a2 100644 --- a/.gitlab/issue_templates/Geo Replicate a new Git repository type.md +++ b/.gitlab/issue_templates/Geo Replicate a new Git repository type.md @@ -465,6 +465,7 @@ That's all of the required database changes. state { Geo::CoolWidgetRegistry.state_value(:failed) } last_synced_at { 1.day.ago } retry_count { 2 } + retry_at { 2.hours.from_now } last_sync_failure { 'Random error' } end diff --git a/.gitlab/issue_templates/Geo Replicate a new blob type.md b/.gitlab/issue_templates/Geo Replicate a new blob type.md index 0c5dbaebacf..df2d1871a85 100644 --- a/.gitlab/issue_templates/Geo Replicate a new blob type.md +++ b/.gitlab/issue_templates/Geo Replicate a new blob type.md @@ -425,6 +425,7 @@ That's all of the required database changes. state { Geo::CoolWidgetRegistry.state_value(:failed) } last_synced_at { 1.day.ago } retry_count { 2 } + retry_at { 2.hours.from_now } last_sync_failure { 'Random error' } end |