summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Test public snippetqa-ml-unquarantine-snippet-testMark Lapierre2019-06-191-5/+3
| | | | | | | | | Public snippets can trigger recaptcha. Try with a private snippet instead. Private snippets can't be embedded, so remove that check. Also unquarantine the test.
* Merge branch '11448-fix-cs-with-k8s-runners' into 'master'James Lopez2019-06-192-1/+6
|\ | | | | | | | | | | | | Fix Container Scanning job with K8S runners Closes gitlab-ee#11448 See merge request gitlab-org/gitlab-ce!29706
| * 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. See merge request gitlab-org/gitlab-ce!29748
| * 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
|\ | | | | | | | | Add identity information to external authorization requests See merge request gitlab-org/gitlab-ce!29461
| * Adds identity information while making external authorization requestsManoj MJ2019-06-194-4/+41
|/ | | | Issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/61201#
* Merge branch 'fix-microsoft-teams-notification-flags' into 'master'Stan Hu2019-06-194-2/+22
|\ | | | | | | | | Fix missing API notification flags for Microsoft Teams See merge request gitlab-org/gitlab-ce!29824
| * 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 section See merge request gitlab-org/gitlab-ce!29829
| * | 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
|\ \ | | | | | | | | | | | | | | | | | | Un-quarantine OAuth spec Closes gitlab-org/quality/nightly#100 See merge request gitlab-org/gitlab-ce!29764
| * | 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
|\ \ \ | | | | | | | | | | | | | | | | Remove support for app label matching See merge request gitlab-org/gitlab-ce!29460
| * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | From now on, only match on the annotations, instead of falling back to legacy app label. This enables users to use the app label for other purposes such as helm charts.
* | | | Merge branch 'removes-database-yml-example' into 'master'Ash McKenzie2019-06-191-0/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Removes database.yml.example See merge request gitlab-org/gitlab-ce!29822
| * | | | Removes database.yml.example file from config/removes-database-yml-exampleMayra Cabrera2019-06-181-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | It's an empty file that was committed by accident on https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/28565
* | | | | Merge branch 'sh-cache-feature-flag-names' into 'master'Thong Kuah2019-06-183-2/+19
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | Cache feature flag names in Redis for a minute Closes #63435 See merge request gitlab-org/gitlab-ce!29816
| * | | | Cache feature flag names in Redis for a minuteStan Hu2019-06-183-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We saw on GitLab.com, the SQL query, `SELECT "features"."key" FROM "features"` peaked at 2300 times per second. We can quiet this down a bit by caching it in Redis for a minute. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/63435
* | | | | Merge branch 'docs-14664-collapsible-job-log' into 'master'Evan Read2019-06-182-0/+14
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Adds docs for job collapsible sections See merge request gitlab-org/gitlab-ce!29792
| * | | | | Adds docs for job collapsible sectionsFilipa Lacerda2019-06-182-0/+14
|/ / / / /
* | | | | Merge branch ↵Mayra Cabrera2019-06-185-34/+39
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '62183-update-response-code-for-bulk-delete-api-for-container-registry' into 'master' Update response code for container registry api bulk delete Closes #62183 See merge request gitlab-org/gitlab-ce!29448
| * | | | Add 2nd response for container api bulk deleteSteve Abrams2019-06-185-34/+39
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | The bulk delete api endpoint for container registries can only be called once per hour. If a user calls the endpoint more than once per hour, they will now receive a 400 error with a descriptive message.
* | | | Merge branch 'docs-ip-access-restriction' into 'master'Evan Read2019-06-181-0/+19
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | Added IP restriction docs to groups See merge request gitlab-org/gitlab-ce!29809
| * | | Added IP restriction docs to groupsJeremy Watson2019-06-181-0/+19
|/ / /
* | | Merge branch 'revert-concurrent-pipeline-schedule-creation' into 'master'Kamil Trzciński2019-06-183-1/+49
|\ \ \ | | | | | | | | | | | | | | | | Revert concurrent pipeline creation for pipeline schedules See merge request gitlab-org/gitlab-ce!29794
| * | | Revert concurrent pipeline schedule creationrevert-concurrent-pipeline-schedule-creationShinya Maeda2019-06-183-1/+49
| | | | | | | | | | | | | | | | | | | | | | | | This commit reverts the previously introduced concurrent pipeline schedule creation which was a viable solution for mitigating inconsistent pipeline schedule by Sidekiq Memory Killer.
* | | | Merge branch 'docs-app-dev-platform' into 'master'Mike Lewis2019-06-181-0/+53
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add docs for Application Development Platform See merge request gitlab-org/gitlab-ce!29765
| * | | | Update phrasing of Security paragraphMike Lewis2019-06-181-3/+3
| | | | |
| * | | | Fix typo in Security sectionMike Lewis2019-06-181-1/+1
| | | | |
| * | | | Update tense on compute sectiondocs-app-dev-platformDaniel Gruesso2019-06-181-1/+1
| | | | |
| * | | | Apply suggestion to doc/topics/application_development_platform/index.mdDaniel Gruesso2019-06-181-1/+1
| | | | |
| * | | | Apply suggestion to doc/topics/application_development_platform/index.mdDaniel Gruesso2019-06-181-1/+1
| | | | |
| * | | | Apply suggestion to doc/topics/application_development_platform/index.mdDaniel Gruesso2019-06-181-1/+1
| | | | |
| * | | | Apply suggestion to doc/topics/application_development_platform/index.mdDaniel Gruesso2019-06-181-1/+1
| | | | |
| * | | | Apply suggestion to doc/topics/application_development_platform/index.mdMike Lewis2019-06-181-2/+2
| | | | |
| * | | | Edit build test deploy sectionMike Lewis2019-06-181-3/+3
| | | | |
| * | | | Update doc overviewMike Lewis2019-06-181-2/+2
| | | | |
| * | | | First draft of app dev platform pagedanielgruesso2019-06-171-0/+53
| | | | |
* | | | | Merge branch 'dm-add-deep-dives-to-docs-ce' into 'master'Nick Thomas2019-06-187-2/+65
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add Create Deep Dives to development docs See merge request gitlab-org/gitlab-ce!29793
| * | | | | Add Create Deep Dives to development docsdm-add-deep-dives-to-docs-ceDouwe Maan2019-06-187-2/+65
| | | | | | | | | | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/create-stage/issues/1 for more context
* | | | | | Merge branch '57815' into 'master'Kamil Trzciński2019-06-187-5/+62
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | #57815 Changes for UltraAuth users See merge request gitlab-org/gitlab-ce!28941
| * | | | | | #57815 Password authentication disabled for UltraAuth usersKartikey Tanna2019-06-187-5/+62
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Disabled password authentication for the users registered using omniauth-ultraauth strategy
* | | | | | Merge branch 'renovate/gitlab-ui-4.x' into 'master'63385-empty-iidMike Greiling2019-06-182-5/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update dependency @gitlab/ui to ^4.3.0 See merge request gitlab-org/gitlab-ce!29800
| * | | | | | Update dependency @gitlab/ui to ^4.3.0null2019-06-182-5/+5
| | | | | | |
* | | | | | | Merge branch 'mc/bug/old-codequality-template-autodevops' into 'master'63415-error-when-viewing-page-2-or-later-of-elasticsearch-search-resultsLin Jen-Shin2019-06-182-24/+12
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use new Code Quality job definition in Auto DevOps See merge request gitlab-org/gitlab-ce!29475
| * | | | | | | Refactor Code Quality templates into single filemc/bug/old-codequality-template-autodevopsMatija Čupić2019-06-142-24/+12
| | | | | | | |
View Lorry Controller Status