summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Make CE and EE consistentantonyliu2019-05-301-1/+1
* Fix method typing errorantonyliu2019-05-291-1/+1
* Merge remote-tracking branch 'origin/i18n-password-of-user-profile' into i18n...antonyliu2019-05-291-3/+3
|\
| * Apply suggestion to app/views/profiles/passwords/edit.html.hamlantonyliu2019-05-292-6/+7
| * Merge branch masterantonyliu2019-05-29291-8914/+4995
| |\
| * | Externalize strings of password page in user profileantonyliu2019-05-254-19/+61
* | | Apply suggestion to app/views/profiles/passwords/edit.html.hamlantonyliu2019-05-292-6/+7
* | | Externalize strings of password page in user profileantonyliu2019-05-293-16/+58
* | | Merge branch 'revert-karma-timeout' into 'master'Grzegorz Bizon2019-05-292-3/+3
|\ \ \
| * | | Increase global karma timeoutrevert-karma-timeoutHeinrich Lee Yu2019-05-292-3/+3
| | |/ | |/|
* | | Merge branch 'repo-router-fixes' into 'master'Filipa Lacerda2019-05-295-11/+17
|\ \ \
| * | | Fixes repository Vue router hiding elements on root URLPhil Hughes2019-05-285-11/+17
* | | | Merge branch 'patch-31' into 'master'Evan Read2019-05-291-4/+4
|\ \ \ \ | |_|/ / |/| | |
| * | | Correct CI_API_V4_URL CI variable namePhy2019-05-281-4/+4
* | | | Merge branch '11105-fix-cs-with-proxy' into 'master'Achilleas Pipinellis2019-05-292-0/+8
|\ \ \ \ | |/ / / |/| | |
| * | | Disable proxy in container scanning templatePhilippe Lafoucrière2019-05-292-0/+8
|/ / /
* | | Merge branch 'patch-49' into 'master'Evan Read2019-05-281-6/+23
|\ \ \
| * | | Improve documentation of RegExp in CI/CD job ref patternsRaphael Das Gupta2019-05-281-6/+23
|/ / /
* | | Merge branch 'auto-devops-kubernestes-bump1-11-10' into 'master'61146-style-tertiary-button-type-to-be-aligned-with-pattern-libraryRobert Speicher2019-05-282-1/+6
|\ \ \
| * | | Bumps Kubernetes version to 1.11.10auto-devops-kubernestes-bump1-11-10Thong Kuah2019-05-212-1/+6
* | | | Merge branch 'qa-unquarantine-auto-devops' into 'master'Dan Davison2019-05-281-2/+1
|\ \ \ \
| * | | | Un-quarantine Auto DevOps QA testun-quarantine-qa-auto-devopsqa-unquarantine-auto-devopsThong Kuah2019-05-271-2/+1
* | | | | Merge branch 'pipelines-email-default-branch-filter' into 'master'Mayra Cabrera2019-05-285-20/+86
|\ \ \ \ \
| * | | | | Add notify_only_default_branch option to PipelinesEmailServicePeter Marko2019-05-285-20/+86
| | |_|/ / | |/| | |
* | | | | Merge branch 'sh-add-header-to-jobs-admin-page' into 'master'Clement Ho2019-05-282-1/+6
|\ \ \ \ \
| * | | | | Add a column header to admin/jobs pagesh-add-header-to-jobs-admin-pageStan Hu2019-05-282-1/+6
* | | | | | Merge branch 'glossary-merge-request-mr' into 'master'Tom Atkins2019-05-281-1/+1
|\ \ \ \ \ \
| * | | | | | Add MR as common abbreviation for 'Merge Request'glossary-merge-request-mrRene Verschoor2019-05-271-1/+1
* | | | | | | Merge branch '62227-webkit-icon-overlap' into 'master'Annabel Dunstone Gray2019-05-282-0/+15
|\ \ \ \ \ \ \
| * | | | | | | Disable webkit icons62227-webkit-icon-overlapJarek Ostrowski2019-05-282-0/+15
* | | | | | | | Merge branch 'kp-clean-up-avatars-stylesheet' into 'master'Annabel Dunstone Gray2019-05-281-98/+142
|\ \ \ \ \ \ \ \
| * | | | | | | | Use SCSS maps and lists to keep code DRYkp-clean-up-avatars-stylesheetKushal Pandya2019-05-271-98/+142
* | | | | | | | | Merge branch 'doc-qa-doc-element-guidelines' into 'master'Lin Jen-Shin2019-05-285-52/+103
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Iteration for _field being the well-formed elementddavison2019-05-281-8/+7
| * | | | | | | | | Add documentation for element naming conventionsddavison2019-05-285-52/+104
* | | | | | | | | | Merge branch 'i18n-chat-of-user-profile' into 'master'Clement Ho2019-05-284-10/+36
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | Externalize strings of chat page in user profileantony liu2019-05-284-10/+36
|/ / / / / / / / /
* | | | | | | | | Merge branch 'docs/gb/expand-downstream-pipeline-variables' into 'master'Douglas Barbosa Alexandre2019-05-281-0/+28
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Docs for a downstream pipeline variables expansionGrzegorz Bizon2019-05-281-0/+28
|/ / / / / / / / /
* | | | | | | | | Merge branch 'i18n-notifications-of-user-profile' into 'master'Bob Van Landuyt2019-05-286-13/+40
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Externalize strings of notifications page in user profileantony liu2019-05-286-13/+40
|/ / / / / / / / /
* | | | | | | | | Merge branch 'qa-extend-click-visit-actions' into 'master'Dan Davison2019-05-2814-46/+145
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Remove blocks from Runtime::Browser.visit calls within Mattermost testsqa-extend-click-visit-actionsddavison2019-05-201-8/+6
| * | | | | | | | Up wait time to 60 seconds as before for LoginPageddavison2019-05-201-1/+1
| * | | | | | | | Implement dynamic validation on QA Pagesddavison2019-05-2013-38/+139
* | | | | | | | | Merge branch '62408-dropdown-truncate' into 'master'Phil Hughes2019-05-282-1/+8
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Truncates job names in pipeline graph62408-dropdown-truncateFilipa Lacerda2019-05-282-1/+8
* | | | | | | | | Merge branch 'ntepluhina-master-patch-12194' into 'master'61539-qa-e2e-test-logging-results-when-tests-are-run-in-parallelPhil Hughes2019-05-281-2/+12
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Added a note about v-slot directiveNatalia Tepluhina2019-05-281-2/+12
|/ / / / / / / /
* | | | | | | | Merge branch 'increase-note-karma-spec-timeout' into 'master'Douglas Barbosa Alexandre2019-05-281-2/+2
|\ \ \ \ \ \ \ \