summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* WIP: use SP_VERSION of sast60879-test-vrt-mr-update-ce-backport-masterVictor Zagorodny2019-05-241-1/+1
|
* WIP: secrets:60879-add-logging-for-timeout-test60879-test-vrt-mr-update-ce-backport-master-more-loggingVictor Zagorodny2019-05-241-0/+2
|
* WIP: Refer to version of sast with more loggingVictor Zagorodny2019-05-241-1/+1
|
* FIXME: keep only SAST in the pipelineVictor Zagorodny2019-05-242-62/+62
|
* Merge branch 'vrt-mr-update-ce-backport' into 'master'Phil Hughes2019-05-243-16/+18
|\ | | | | | | | | Conformance MR for Update Visual Review Toolbar to post to MRs See merge request gitlab-org/gitlab-ce!28687
| * Add changes to match eevrt-mr-update-ce-backportsarahghp2019-05-233-16/+18
| |
* | Merge branch '38561-border-radii' into 'master'Phil Hughes2019-05-244-1/+14
|\ \ | | | | | | | | | | | | | | | | | | Fix border radii on diff files and repo files Closes #38483 and #38561 See merge request gitlab-org/gitlab-ce!28675
| * | Fix border radii on diff files and repo files38561-border-radiiAnnabel Dunstone Gray2019-05-234-1/+14
| | |
* | | Merge branch 'style-avatar-component' into 'master'Kushal Pandya2019-05-244-38/+41
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Style avatar component Closes gitlab-ui#252 See merge request gitlab-org/gitlab-ce!28399
| * | | Move avatar related styles to components directoryJacques Erasmus2019-05-244-38/+41
|/ / / | | | | | | | | | Moved all avatar related styles to the components directory
* | | Merge branch ↵Filipa Lacerda2019-05-243-12/+12
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '59987-move-sign-in-2fa-on-users-sign_in-above-intro-content-on-mobile' into 'master' Resolve "Move sign-in/2FA on users/sign_in above intro content on mobile" Closes #59987 See merge request gitlab-org/gitlab-ce!28360
| * | | Prioritize login form on mobile breakpoint59987-move-sign-in-2fa-on-users-sign_in-above-intro-content-on-mobileDennis Tang2019-05-163-12/+12
| | | |
* | | | Merge branch 'patch-64' into 'master'Kamil Trzciński2019-05-242-0/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update SAST.gitlab-ci.yml - Add SAST_GITLEAKS_ENTROPY_LEVEL Closes #62179 See merge request gitlab-org/gitlab-ce!28607
| * | | | Update SAST.gitlab-ci.yml - Add SAST_GITLEAKS_ENTROPY_LEVELLucas Charles2019-05-242-0/+6
|/ / / / | | | | | | | | | | | | | | | | This env was missing, causing the variable to not be propagated to child containers and thus, be ineffective
* | | | Merge branch 'js-18n-batch-comments' into 'master'Kushal Pandya2019-05-242-2/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | i18n of batch_comments directory See merge request gitlab-org/gitlab-ce!28178
| * | | | I18N of batch_comments directoryjs-18n-batch-commentsBrandon Labuschagne2019-05-212-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is one of many MRs opened in order to improve the overall internationalisation of the GitLab codebase. This commit only targets Vanilla JS files. i18n documentation https://docs.gitlab.com/ee/development/i18n/externalization.html
* | | | | Merge branch '56959-remove-auto-devops-domain-ci-variable' into 'master'Stan Hu2019-05-2411-256/+20
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Drop support for AUTO_DEVOPS_DOMAIN See merge request gitlab-org/gitlab-ce!28460
| * | | | | Removes mention of $AUTO_DEVOPS_DOMAIN in doc56959-remove-auto-devops-domain-ci-variableThong Kuah2019-05-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Even though there's no relation to the feature (it's actually about overriding template values, best to replace this with $KUBE_INGRESS_BASE_DOMAIN to avoid any potential confusion
| * | | | | Remove un-used methodsThong Kuah2019-05-242-36/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These two methods were used in emitting AUTO_DEVOPS_DOMAIN which has now been dropped.
| * | | | | Stop emitting AUTO_DEVOPS_DOMAIN Ci variableThong Kuah2019-05-2410-219/+19
| | |_|_|/ | |/| | | | | | | | | | | | | Update documentation to reflect removal
* | | | | Merge branch '54528-add-rack-attack-to-structured-logs' into 'master'Stan Hu2019-05-246-2/+50
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes RackAttack logger to use structured logs Closes #54528 See merge request gitlab-org/gitlab-ce!28565
| * | | | | Changes RackAttack logger to use structured logsMayra Cabrera2019-05-246-2/+50
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Creates a new filename to register auth logs. This change should allow SRE's queries to make better queries through logging infrastructure. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/54528
* | | | | Merge branch '10795-add-epic-tree-BE-initial-support-docs' into 'master'Achilleas Pipinellis2019-05-231-1/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update Epic Link documentation See merge request gitlab-org/gitlab-ce!28684
| * | | | | Update Epic Link documentationBrett Walker2019-05-231-1/+2
| | | | | |
* | | | | | Merge branch 'docs/ssot_geo_nodes' into 'master'Achilleas Pipinellis2019-05-231-3/+19
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | Edit Geo nodes content to comply with SSOT guidelines See merge request gitlab-org/gitlab-ce!28519
| * | | | | Edit Geo nodes content to comply with SSOT guidelinesRussell Dickenson2019-05-231-3/+19
|/ / / / /
* | | | | Merge branch 'docs/clarify-kubernetes-roles' into 'master'Achilleas Pipinellis2019-05-231-43/+44
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Rewording to clarify Access Control docs Closes #61204 See merge request gitlab-org/gitlab-ce!28452
| * | | | Rewording to clarify Access Control docsEvan Read2019-05-231-43/+44
|/ / / /
* | | | Merge branch 'sh-fix-omniauth-generic-strategy' into 'master'Douglas Barbosa Alexandre2019-05-233-1/+41
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix OmniAuth OAuth2Generic strategy not loading Closes #62216 See merge request gitlab-org/gitlab-ce!28680
| * | | | Fix OmniAuth OAuth2Generic strategy not loadingStan Hu2019-05-233-1/+41
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In https://github.com/rails/rails/commit/83b767ce, Rails 5.1 removed support for using a String to specify a middleware. When the strategy_class argument is passed from the GitLab YAML config to Devise, Devise passes the string value straight through to Rails, and GitLab would crash with a NoMethodError inside ActionDispatch::MiddlewareStack. To make this OmniAuth strategy work again, we normalize the arguments by converting the strategy_class value into an actual Class. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/62216
* | | | Merge branch 'js-i18n-lib' into 'master'Clement Ho2019-05-233-14/+47
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Internationalisation of lib directory See merge request gitlab-org/gitlab-ce!27711
| * | | | Internationalisation of lib directoryBrandon Labuschagne2019-05-233-14/+47
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is one of many MRs opened in order to improve the overall internationalisation of the GitLab codebase. i18n documentation https://docs.gitlab.com/ee/development/i18n/externalization.html
* | | | Merge branch 'fe-docs-utility-first' into 'master'Clement Ho2019-05-231-8/+32
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add "utility-first" section to FE scss style guide Closes gitlab-ui#38 See merge request gitlab-org/gitlab-ce!28312
| * | | | Apply suggestion to doc/development/fe_guide/style_guide_scss.mdfe-docs-utility-firstPaul Slaughter2019-05-221-1/+1
| | | | |
| * | | | Add utility-first css section to fe docsPaul Slaughter2019-05-141-0/+19
| | | | |
| * | | | Clean up readability of utility class style guidePaul Slaughter2019-05-141-9/+14
| | | | |
* | | | | Merge branch '62107-fix-detail-page-header-height' into 'master'Annabel Dunstone Gray2019-05-232-1/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes issue height of detail-page-header Closes #62193 and #62107 See merge request gitlab-org/gitlab-ce!28650
| * | | | | Fixes issue height of detail-page-headerErik van der Gaag2019-05-232-1/+5
|/ / / / / | | | | | | | | | | | | | | | detail-page-header-body class was making the height of the header 1 pixel too big to fit evenly
* | | | | Merge branch 'docs/improve-writing-tests-doc' into 'master'Tanya Pazitny2019-05-231-3/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Improve doc based on Zeff's suggestions See merge request gitlab-org/gitlab-ce!28664
| * | | | | Apply suggestion to qa/docs/WRITING_TESTS_FROM_SCRATCH.mddocs/improve-writing-tests-docWalmyr2019-05-231-1/+1
| | | | | |
| * | | | | Apply suggestion to qa/docs/WRITING_TESTS_FROM_SCRATCH.mdWalmyr2019-05-231-1/+1
| | | | | |
| * | | | | Improve doc based on Zeff's suggestionsWalmyr Lima2019-05-231-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | The suggestions were made while we were pair programming.
* | | | | | Merge branch 'nfriend-ignore-rubocop-cache-files' into 'master'Stan Hu2019-05-231-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ignore files in tmp/rubocop_cache/** See merge request gitlab-org/gitlab-ce!28672
| * | | | | | Ignore tmp/rubocop_cache directoriesnfriend-ignore-rubocop-cache-filesNathan Friend2019-05-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit ignores the temporary cache directories that I _think_ are created by the VSCode Ruby extension.
* | | | | | | Merge branch '58869-unified-fe-test-script' into 'master'Clement Ho2019-05-233-6/+136
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create a unified script to run Jest & Karma tests Closes #58869 See merge request gitlab-org/gitlab-ce!27239
| * | | | | | Update FE test script58869-unified-fe-test-scriptPaul Slaughter2019-05-131-22/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Don't fail when no tests match - Print the cmd prefix for each line in it's data - Update exit code handling - Add colors to summary message
| * | | | | | Add empty test suite flag to karma wrapperPaul Slaughter2019-05-131-5/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is already supported karma feature, but it wasn't respected because our wrapper threw an error no matter what. https://github.com/karma-runner/karma/blob/fe9a1dd13b5eb3969f9e08acbce020e2a382fd9e/lib/cli.js#L201
| * | | | | | Create a unified script to run Jest & Karma testsPaul Gascou-Vaillancourt2019-05-132-1/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Created scripts/frontend/test.js - Updated test task to call Node script
* | | | | | | Merge branch 'docs/ssot_cicd_settings' into 'master'Marcia Ramos2019-05-231-0/+16
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Edit CI/CD settings for SSOT guidelines See merge request gitlab-org/gitlab-ce!28582
| * | | | | | | Edit CI/CD settings for SSOT guidelinesRussell Dickenson2019-05-231-0/+16
|/ / / / / / /
View Lorry Controller Status