summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Backport gitlab.yml.example from EEconfig-yaml-differencesYorick Peterse2019-06-206-9/+258
* Backport Prometheus YAML config from EEYorick Peterse2019-06-201-2/+2
* Backport Sidekiq queue names from EEYorick Peterse2019-06-201-0/+17
* Backport dependency decisions from EEYorick Peterse2019-06-191-0/+7
* Backport EE YAML settings for PostgreSQLYorick Peterse2019-06-191-0/+9
* Merge branch 'docs/12-0-upgrade-correction' into 'master'Marin Jankovski2019-06-191-8/+5
|\
| * Correct upgrade guides for 12.0Yorick Peterse2019-06-191-8/+5
* | Merge branch '63399-intermittent-spec-failure-in-spec-models-ci-pipeline_sche...Nick Thomas2019-06-191-1/+1
|\ \
| * | Set a fixed date in pipeline shedule specHeinrich Lee Yu2019-06-191-1/+1
| |/
* | Merge branch 'docs/file-lock-update' into 'master'Marcia Ramos2019-06-196-42/+41
|\ \ | |/ |/|
| * Update file locking docsAchilleas Pipinellis2019-06-196-42/+41
|/
* Merge branch 'qa-ml-unquarantine-branches-test' into 'master'Sanad Liaquat2019-06-191-2/+1
|\
| * Unquarantine the branches E2E testqa-ml-unquarantine-branches-testMark Lapierre2019-06-191-2/+1
* | Merge branch 'docs/12-0-upgrade' into 'master'Achilleas Pipinellis2019-06-191-0/+21
|\ \
| * | Added source upgrade guides for 12.0.0docs/12-0-upgradeYorick Peterse2019-06-181-0/+21
* | | Merge branch 'ac-usage-quotas-docs' into 'master'Achilleas Pipinellis2019-06-194-4/+10
|\ \ \
| * | | Document Usage Quotas group settings pageAlessio Caiazza2019-06-194-4/+10
|/ / /
* | | Merge branch 'link_zoom_call_issue-docs' into 'master'Achilleas Pipinellis2019-06-192-0/+6
|\ \ \
| * | | Add zoom call section in issue data pagelink_zoom_call_issue-docsSeth Engelhard2019-06-182-0/+6
* | | | Merge branch '57918-encrypt-feature-flags-tokens-changelog' into 'master'Kamil Trzciński2019-06-191-0/+5
|\ \ \ \
| * | | | Add changelog for feature flags encrypted tokensKrasimir Angelov2019-06-191-0/+5
|/ / / /
* | | | Merge branch 'qa-ml-unquarantine-merge-fork-test' into 'master'Ramya Authappan2019-06-192-4/+2
|\ \ \ \
| * | | | Unquarantine e2e testsMark Lapierre2019-06-192-4/+2
* | | | | Merge branch 'jl-simplify-mattermost-docs' into 'master'Achilleas Pipinellis2019-06-193-1/+8
|\ \ \ \ \
| * | | | | Crosslink Mattermost integrations, simplify components listJoshua Lambert2019-06-193-1/+8
|/ / / / /
* | | | | Merge branch '52954-allow-developers-to-delete-tags' into 'master'James Lopez2019-06-1920-33/+44
|\ \ \ \ \
| * | | | | Add documentation and testsManoj MJ2019-06-1920-33/+44
|/ / / / /
* | | | | Merge branch '11448-fix-cs-with-k8s-runners' into 'master'James Lopez2019-06-192-1/+6
|\ \ \ \ \
| * | | | | Fix Container Scanning job with K8S runnersPhilippe Lafoucrière2019-06-192-1/+6
|/ / / / /
* | | | | Merge branch 'bvl-dont-translate-api-docs' into 'master'Achilleas Pipinellis2019-06-191-0/+3
|\ \ \ \ \
| * | | | | Add note about not translating API messages.Bob Van Landuyt2019-06-191-0/+3
|/ / / / /
* | | | | Merge branch '61201-pass-identities-to-external-authorization' into 'master'Jan Provaznik2019-06-194-4/+41
|\ \ \ \ \
| * | | | | Adds identity information while making external authorization requestsManoj MJ2019-06-194-4/+41
|/ / / / /
* | | | | Merge branch 'fix-microsoft-teams-notification-flags' into 'master'Stan Hu2019-06-194-2/+22
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add missing test for Microsoft Teams notify_only_default_branch flagSeiji Suenaga2019-06-181-0/+12
| * | | | 59702 Add changelog entrySeiji Suenaga2019-06-181-0/+5
| * | | | 59702 Fix API notification flags for MS TeamsSeiji Suenaga2019-06-182-2/+5
* | | | | Merge branch 'docs/indent-new-section' into 'master'Achilleas Pipinellis2019-06-191-1/+1
|\ \ \ \ \
| * | | | | Demote new sectionEvan Read2019-06-191-1/+1
|/ / / / /
* | | | | Merge branch 'qa-nightly-100-un-quarantine-oauth-spec' into 'master'Sanad Liaquat2019-06-191-2/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Unquarantine OAuth specqa-nightly-100-un-quarantine-oauth-specSanad Liaquat2019-06-171-2/+1
* | | | | Merge branch 'remove-support-for-app-label-matching' into 'master'Ash McKenzie2019-06-193-18/+2
|\ \ \ \ \
| * | | | | Docs: note removal of app label supportremove-support-for-app-label-matchingThong Kuah2019-06-191-2/+1
| * | | | | Stop matching on legacy app labelThong Kuah2019-06-192-16/+1
* | | | | | Merge branch 'removes-database-yml-example' into 'master'Ash McKenzie2019-06-191-0/+0
|\ \ \ \ \ \
| * | | | | | Removes database.yml.example file from config/removes-database-yml-exampleMayra Cabrera2019-06-181-0/+0
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'sh-cache-feature-flag-names' into 'master'Thong Kuah2019-06-183-2/+19
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Cache feature flag names in Redis for a minuteStan Hu2019-06-183-2/+19
* | | | | | Merge branch 'docs-14664-collapsible-job-log' into 'master'Evan Read2019-06-182-0/+14
|\ \ \ \ \ \
| * | | | | | Adds docs for job collapsible sectionsFilipa Lacerda2019-06-182-0/+14
|/ / / / / /