diff options
| author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2018-12-06 17:49:20 +0000 |
|---|---|---|
| committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2018-12-06 17:49:20 +0000 |
| commit | e80f89337b4be31c5531448861cedb556d02c01e (patch) | |
| tree | fe44d5374b30f3462a38f7e59e5b937c10b78afb /db/fixtures | |
| parent | 2e3cefa6cdeabe9bfd169df9ed280895deb57be3 (diff) | |
| parent | 75ae3af19bfe6b1d06f69116b12e73bdeb502ebf (diff) | |
| download | gitlab-ce-e80f89337b4be31c5531448861cedb556d02c01e.tar.gz | |
Merge branch '54610-allow-review-jobs-to-fail' into 'master'
Retry the review-{deploy,qa} jobs twice, and allow them to fail
Closes #54610 and #54717
See merge request gitlab-org/gitlab-ce!23510
Diffstat (limited to 'db/fixtures')
| -rw-r--r-- | db/fixtures/production/001_application_settings.rb | 2 | ||||
| -rw-r--r-- | db/fixtures/production/002_admin.rb (renamed from db/fixtures/production/001_admin.rb) | 0 |
2 files changed, 2 insertions, 0 deletions
diff --git a/db/fixtures/production/001_application_settings.rb b/db/fixtures/production/001_application_settings.rb new file mode 100644 index 00000000000..ab15717e9a9 --- /dev/null +++ b/db/fixtures/production/001_application_settings.rb @@ -0,0 +1,2 @@ +puts "Creating the default ApplicationSetting record.".color(:green) +Gitlab::CurrentSettings.current_application_settings diff --git a/db/fixtures/production/001_admin.rb b/db/fixtures/production/002_admin.rb index 1c7c89f7bbd..1c7c89f7bbd 100644 --- a/db/fixtures/production/001_admin.rb +++ b/db/fixtures/production/002_admin.rb |