summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | Merge branch 'docs/merge-request-pipelines' into 'master'Achilleas Pipinellis2019-04-171-1/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Add note about MR Pipeline Runner versiondocs/merge-request-pipelinesSteve Azzopardi2019-04-171-1/+7
* | | | | | | | | | | | | | | | Merge branch 'patch-39' into 'master'Achilleas Pipinellis2019-04-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Fix typo [skip ci]Katrin Leinweber2019-04-161-1/+1
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'docs/external-prometheus-updates' into 'master'Achilleas Pipinellis2019-04-171-2/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Update external prometheus configdocs/external-prometheus-updatesCindy Pallares2019-04-161-2/+16
| | |_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch '10083-dropdown-ce-ee-difference' into 'master'Filipa Lacerda2019-04-174-6/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Removes EE diffs for dropdown_value_collapsed10083-dropdown-ce-ee-differenceDenys Mishunov2019-04-154-6/+16
* | | | | | | | | | | | | | | | | Merge branch '9956-move-ee-differences' into 'master'Filipa Lacerda2019-04-171-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Backport of "Resolves EE differences for project_new.js"Donald Cook2019-04-171-0/+6
|/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge branch 'kmcknight-group-typo' into 'master'Achilleas Pipinellis2019-04-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Fix typoKen McKnight2019-04-171-1/+1
|/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge branch '59831-related-items-scss-cleanup-ce' into 'master'Filipa Lacerda2019-04-173-235/+211
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Fix stylelint warnings in related_items_list.scss59831-related-items-scss-cleanup-ceAnnabel Dunstone Gray2019-04-163-235/+211
* | | | | | | | | | | | | | | | | | Merge branch 'boards-stylelint' into 'master'Filipa Lacerda2019-04-1717-241/+60
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Fix stylelint rules in boards.scssPhil Hughes2019-04-1617-241/+60
* | | | | | | | | | | | | | | | | | Merge branch 'filipa-master-patch-09545' into 'master'Phil Hughes2019-04-171-31/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Removes ifEE example for JS codefilipa-master-patch-09545Filipa Lacerda2019-04-161-31/+11
* | | | | | | | | | | | | | | | | | | Merge branch '59275-cluster-form-hints' into 'master'Phil Hughes2019-04-174-15/+39
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Add help texts to K8 form fieldsEnrique Alcántara2019-04-174-15/+39
|/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge branch 'fix-logic-in-43263-git-push-option-to-create-mr-test' into 'mas...11-11-auto-deploy-0012345Lin Jen-Shin2019-04-171-4/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Fix logic in Api::Internal testfix-logic-in-43263-git-push-option-to-create-mr-testLuke Duncalfe2019-04-171-4/+2
* | | | | | | | | | | | | | | | | | | Merge branch 'tortuetorche/gitlab-ce-patch-auto-deploy-extra-values' into 'ma...Grzegorz Bizon2019-04-173-0/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Rename HELM_EXTRA_ARGS to differentiate between helm invocationstortuetorche/gitlab-ce-patch-auto-deploy-extra-valuesJames Fargher2019-04-172-4/+4
| * | | | | | | | | | | | | | | | | | | Apply suggestion to doc/topics/autodevops/index.mdJames Fargher2019-04-111-1/+1
| * | | | | | | | | | | | | | | | | | | Apply suggestion to doc/topics/autodevops/index.mdJames Fargher2019-04-101-1/+1
| * | | | | | | | | | | | | | | | | | | Add HELM_EXTRA_ARGS to all Auto-DevOps helm invocationsJames Fargher2019-04-083-0/+7
| * | | | | | | | | | | | | | | | | | | Allows extra arguments in helm commands for auto-deploying applicationTortue Torche2019-04-081-0/+2
* | | | | | | | | | | | | | | | | | | | Merge branch 'fix-sidebar-spec-master' into 'master'Michael Kozono2019-04-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Fix no assignee text in sidebar_specfix-sidebar-spec-masterLuke Bennett2019-04-171-1/+1
|/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge branch '58361-issue-create-system-note-timestamp' into 'master'Stan Hu2019-04-164-2/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Set correct timestamps when creating past issues58361-issue-create-system-note-timestampHeinrich Lee Yu2019-04-164-2/+16
* | | | | | | | | | | | | | | | | | | | Merge branch 'none-for-assignees' into 'master'Annabel Dunstone Gray2019-04-164-13/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | `None` for assigneesVictor Wu2019-04-164-13/+13
|/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | Merge branch 'zj-git-2.21-tests' into 'master'Douglas Barbosa Alexandre2019-04-166-9/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Update preflight check to require 2.21zj-git-2.21-testsZeger-Jan van de Weg2019-04-161-1/+1
| * | | | | | | | | | | | | | | | | | | Update source install docs for Git 2.21Zeger-Jan van de Weg2019-04-161-4/+4
| * | | | | | | | | | | | | | | | | | | Test using Git 2.21Zeger-Jan van de Weg2019-04-164-4/+9
* | | | | | | | | | | | | | | | | | | | Merge branch '60605-karma-failing' into 'master'Michael Kozono2019-04-161-18/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Add sync: false to fix Karma tests60605-karma-failingNathan Friend2019-04-161-18/+32
|/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge branch 'docs-cicd-workflow-illustration' into 'master'Achilleas Pipinellis2019-04-162-16/+45
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Docs: CI/CD intro - add new illustration + descriptionMarcia Ramos2019-04-162-16/+45
|/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge branch 'resource-label-events-api-link' into 'master'Achilleas Pipinellis2019-04-162-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Link to resource label events APIVictor Wu2019-04-162-0/+4
|/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge branch 'winh-frontend-faq-docs' into 'master'Marcia Ramos2019-04-162-0/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Create frontend FAQ (documentation)Winnie Hellmann2019-04-162-0/+31
|/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge branch '59034-external-link-button' into 'master'Tim Zallmann2019-04-162-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Replaced external link button with doc-text icon59034-external-link-buttonDenys Mishunov2019-04-152-1/+6
* | | | | | | | | | | | | | | | | | | Merge branch 'nfriend-update-merge-request-widget-for-post-merge-pipelines' i...Filipa Lacerda2019-04-1613-5/+270
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Add two warning messages to the MR widgetnfriend-update-merge-request-widget-for-post-merge-pipelinesNathan Friend2019-04-1513-5/+270