summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add specallow-full-ref-specification-for-pipeline-creationShinya Maeda2019-02-141-0/+18
|
* Allow full ref specification for pipeline creationShinya Maeda2019-02-142-1/+7
|
* Merge branch 'qa-ml-quarantine-context' into 'master'Sanad Liaquat2019-02-142-173/+226
|\ | | | | | | | | [QA] Skip contexts in quarantine See merge request gitlab-org/gitlab-ce!24942
| * Skip contexts in quarantineMark Lapierre2019-02-142-173/+226
|/ | | | This avoids running before/after blocks for tests that are in quarantine
* Merge branch 'docs/gitlab-flow' into 'master'Evan Read2019-02-131-224/+234
|\ | | | | | | | | Rewrite GitLab Flow doc See merge request gitlab-org/gitlab-ce!20951
| * Rewrite GitLab Flow docStephen Wade2019-02-131-224/+234
|/
* Merge branch ↵Robert Speicher2019-02-132-7/+18
|\ | | | | | | | | | | | | | | | | '57634-issue-when-viewing-a-document-with-footnotes-actionview-template-error-undefined-method-at_css-for-nil-nilclass' into 'master' Issue when viewing a document with footnotes Closes #57634 See merge request gitlab-org/gitlab-ce!25199
| * Properly handle multiple refs to same footnoteBrett Walker2019-02-132-7/+18
| |
* | Merge branch 'improve-review-apps-docs' into 'master'Mek Stittri2019-02-131-2/+6
|\ \ | | | | | | | | | | | | [Docs] Improve the Review Apps documentation See merge request gitlab-org/gitlab-ce!25161
| * | Improve the Review Apps documentationRémy Coutable2019-02-121-2/+6
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Merge branch '30299-fix-polling-for-transformed-notes' into 'master'Douwe Maan2019-02-134-6/+15
|\ \ \ | | | | | | | | | | | | | | | | Fix polling for transformed individual notes See merge request gitlab-org/gitlab-ce!25084
| * | | Fix polling for transformed individual notes30299-fix-polling-for-transformed-notesHeinrich Lee Yu2019-02-134-6/+15
| | | | | | | | | | | | | | | | | | | | Sets `updated_at` so that the transformed note is returned together with the new reply
* | | | Merge branch 'sh-fix-content-disposition-inline' into 'master'Douglas Barbosa Alexandre2019-02-132-1/+18
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Content-Disposition hard-coded to attachments Closes #57660 See merge request gitlab-org/gitlab-ce!25214
| * | | | Fix Content-Disposition hard-coded to attachmentsStan Hu2019-02-132-1/+18
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to a regression in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24919, Content-Disposition is hard-coded to `attachment` instead of `inline`. We now use the argument `disposition` to fix that problem. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/57660
* | | | Merge branch '56087-danger-roulette' into 'master'Rémy Coutable2019-02-139-45/+562
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewer roulette via Danger Closes #56087 See merge request gitlab-org/gitlab-ce!24938
| * | | | Reviewer roulette via Danger56087-danger-rouletteNick Thomas2019-02-138-51/+561
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make danger pick reviewers and maintainers at random, for feontend, backend, database, etc, changes, whenever files belonging to those teams get changed.
| * | | | Move the ee? helper method into the helperNick Thomas2019-02-132-5/+6
| | | | |
| * | | | Move change category detection to a helperNick Thomas2019-02-132-12/+18
| | |_|/ | |/| |
* | | | Merge branch '57160-merge-request-tabs-header-is-missing-bottom-border' into ↵Annabel Dunstone Gray2019-02-132-5/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Merge Request Tabs Header is missing bottom border" Closes #57160 See merge request gitlab-org/gitlab-ce!25198
| * | | | Return border bottom on MR TabsSam Bigelow2019-02-132-5/+8
| | | | |
* | | | | Merge branch '57101-api-docs-for-hangouts-chat-service-incorrect' into 'master'Rémy Coutable2019-02-133-5/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API: Fix docs and parameters for hangouts-chat service Closes #57101 See merge request gitlab-org/gitlab-ce!25180
| * | | | | API: Fix docs and parameters for hangouts-chat serviceRobert Schilling2019-02-133-5/+11
| | | | | |
* | | | | | Merge branch '39676-wiki-api-problems-on-update-parameters-and-500-error' ↵Rémy Coutable2019-02-133-17/+41
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Only require one parameter when updating a Wiki via the API Closes #39676 See merge request gitlab-org/gitlab-ce!25191
| * | | | | Only require one parameter when updating a Wiki via the APIRobert Schilling2019-02-133-17/+41
|/ / / / /
* | | | | Merge branch '57589-update-workhorse' into 'master'Stan Hu2019-02-132-1/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Workhorse to v8.3.1 Closes #57589 See merge request gitlab-org/gitlab-ce!25188
| * | | | | Update Workhorse to v8.3.1Nick Thomas2019-02-132-1/+6
| | | | | |
* | | | | | Merge branch ↵Phil Hughes2019-02-133-3/+94
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '57382-add-documentation-how-to-track-an-event-to-frontend-documentation' into 'master' Resolve "Add documentation "How to track an event" to Frontend documentation" Closes #57382 See merge request gitlab-org/gitlab-ce!24995
| * | | | | | Add event tracking documentationMartin Wortschack2019-02-133-3/+94
|/ / / / / / | | | | | | | | | | | | | | | | | | - Add link to Event tracking in FE guides
* | | | | | Merge branch 'diff-fix-duplicate-key-error' into 'master'Filipa Lacerda2019-02-133-9/+25
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed diff rendering causing a duplicate key warning Closes #56797 See merge request gitlab-org/gitlab-ce!24634
| * | | | | | Fixed diff rendering causing a duplicate key warningPhil Hughes2019-02-133-9/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/56797
* | | | | | | Merge branch 'docs-fix-typo-web_ide.md' into 'master'Rémy Coutable2019-02-131-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a typo See merge request gitlab-org/gitlab-ce!25152
| * | | | | | | Fix typosnyonyoron2019-02-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | "commited" is a misspelling of "committed"
* | | | | | | | Merge branch 'docs-fix-typo' into 'master'Rémy Coutable2019-02-131-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typo. "sysdamin" is a misspelling of "sysadmin". See merge request gitlab-org/gitlab-ce!25151
| * | | | | | | | Fix typo. "sysdamin" is a misspelling of "sysadmin".koda32019-02-121-1/+1
| | | | | | | | |
* | | | | | | | | Merge branch 'patch-43' into 'master'Rémy Coutable2019-02-131-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Fix a typo in doc/development/documentation/styleguide.md See merge request gitlab-org/gitlab-ce!25149
| * | | | | | | | Fix a typok-nakayama-pg2019-02-121-1/+1
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch '56237-api-truncated-commit-title' into 'master'Rémy Coutable2019-02-133-2/+8
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API: Expose full commit title Closes #56237 See merge request gitlab-org/gitlab-ce!25189
| * | | | | | | | API: Expose full commit titleRobert Schilling2019-02-133-2/+8
|/ / / / / / / /
* | | | | | | | Merge branch 'add-title-attribute-to-file-row' into 'master'Annabel Dunstone Gray2019-02-132-0/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add title attr to display file name See merge request gitlab-org/gitlab-ce!25154
| * | | | | | | | add title attr to display file nameSatoshi Nakamatsu2019-02-132-0/+6
|/ / / / / / / /
* | | | | | | | Merge branch '50559-add-milestone-progress-to-api' into 'master'Rémy Coutable2019-02-137-4/+20
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add milestone progress to API Closes #50559 See merge request gitlab-org/gitlab-ce!25173
| * | | | | | | | Add milestone progress to APIRobert Schilling2019-02-137-4/+20
|/ / / / / / / /
* | | | | | | | Merge branch 'docs/pages-subgroup-admin' into 'master'Marcia Ramos2019-02-131-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix pages admin documentation reference to subgroups See merge request gitlab-org/gitlab-ce!25163
| * | | | | | | | Fix pages admin reference to subgroupsAlessio Caiazza2019-02-121-1/+1
| | | | | | | | |
* | | | | | | | | Merge branch 'support-only-changes-on-mr-pipelines' into 'master'Kamil Trzciński2019-02-136-10/+112
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support `only: changes:` on MR pipelines See merge request gitlab-org/gitlab-ce!24490
| * | | | | | | | | Support `only: changes:` on MR pipelinesHiroyuki Sato2019-02-136-10/+112
|/ / / / / / / / /
* | | | | | | | | Merge branch ↵Kamil Trzciński2019-02-134-1/+31
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '57410-api-create-release-link-with-ftp-address-return-400-bad-request' into 'master' Add support for FTP assets for releases Closes #57410 See merge request gitlab-org/gitlab-ce!25071
| * | | | | | | | | Add support for FTP assets for releasesRobert Schilling2019-02-134-1/+31
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend the list of supported protocols to include FTP.
* | | | | | | | | Merge branch 'docs-kubernetes-development-guide' into 'master'Marcia Ramos2019-02-132-0/+127
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Documentation: Development guide for Kubernetes See merge request gitlab-org/gitlab-ce!24618
| * | | | | | | | Development guide for Kubernetesdocs-kubernetes-development-guideThong Kuah2019-02-122-0/+127
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Start writing some development guidelines in relation to our Kubernetes integration