diff options
| author | Mike Greiling <mike@pixelcog.com> | 2017-10-09 15:00:00 -0500 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2017-10-09 15:00:00 -0500 |
| commit | f7837988250bb93069b1e7473c40d155de75a111 (patch) | |
| tree | 0a95264614e399b475cfeba3d0d158dd9705d0af /.gitlab-ci.yml | |
| parent | 02838d5be2f899793ce5e026f0bb20c509697061 (diff) | |
| parent | d6170ce4d8a0cbfd8552531c29163e44549222cf (diff) | |
| download | gitlab-ce-f7837988250bb93069b1e7473c40d155de75a111.tar.gz | |
Merge branch 'master' into sh-headless-chrome-support
* master: (113 commits)
Introduce new hook data builders for Issue and MergeRequest
Don't create todos for old issue assignees
Start adding Gitlab::HookData::IssuableBuilder
Include the changes in issuable webhook payloads
Rename the `codeclimate` job to `codequality`
Don't show an "Unsubscribe" link in snippet comment notifications
Add QA::Scenario::Gitlab::Group::Create
Removes CommitsList from global namespace
Fix wiki empty page translation namespace not being removed
Fixes mini graph in commit view
Fix link to new i18n index page
Update i18n docs
Move i18n/introduction to i18n/index
Resolve "Simple documentation update - backup to restore in restore section"
Remove AjaxLoadingSpinner and CreateLabelDropdown from global namespace
Move cycle analytics banner into a vue file
Updated Icons + Fix for Collapsed Groups Angle
Don't create fork networks for root projects that are deleted
Remove executable permissions on images to make docs lint happy
Sync up hard coded DN class in migration
...
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 422bf1ced5a..ebbf8ba0171 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -270,6 +270,7 @@ flaky-examples-check: NEW_FLAKY_SPECS_REPORT: rspec_flaky/report-new.json stage: post-test allow_failure: yes + retry: 0 only: - branches except: @@ -429,6 +430,7 @@ ee_compat_check: - branches@gitlab-org/gitlab-ee - branches@gitlab/gitlab-ee allow_failure: yes + retry: 0 cache: key: "ee_compat_check_repo" paths: @@ -578,7 +580,7 @@ karma: - chrome_debug.log - coverage-javascript/ -codeclimate: +codequality: <<: *except-docs <<: *pull-cache before_script: [] |