summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | 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
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'docs/ssot_admin_area_email' into 'master'Marcia Ramos2019-05-231-3/+21
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Edit email settings for SSOT See merge request gitlab-org/gitlab-ce!28629
| * | | | | | | | | | | Edit email settings for SSOTRussell Dickenson2019-05-231-3/+21
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'docs/ssot_external_auth' into 'master'Marcia Ramos2019-05-231-0/+16
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Edit external auth for SSOT See merge request gitlab-org/gitlab-ce!28630
| * | | | | | | | | | Edit external auth for SSOTRussell Dickenson2019-05-231-0/+16
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'api_masked_variables' into 'master'Bob Van Landuyt2019-05-235-4/+21
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API: Allow to get and set "masked" attribute for variables Closes #61754 See merge request gitlab-org/gitlab-ce!28381
| * | | | | | | | | | API: Allow to get and set "masked" attribute for variablesMathieu Parent2019-05-225-4/+21
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'patch-65' into 'master'Rémy Coutable2019-05-231-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Container Registry is now proper cased See merge request gitlab-org/gitlab-ce!28660
| * | | | | | | | | | | Container Registry is now proper casedBrendan O'Leary 🐢2019-05-231-2/+2
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'renovate/gitlab-svgs-1.x' into 'master'Phil Hughes2019-05-232-169/+23
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update dependency @gitlab/svgs to ^1.62.0 See merge request gitlab-org/gitlab-ce!28605
| * | | | | | | | | | | | Update dependency @gitlab/svgs to ^1.62.0Lukas 'Eipi' Eipert2019-05-232-169/+23
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch '59026-replace-favicon' into 'master'Phil Hughes2019-05-232-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add new favicon for canary from next.gitlab.com Closes #59026 See merge request gitlab-org/gitlab-ce!28601
| * | | | | | | | | | | | | Add new favicon59026-replace-faviconJarek Ostrowski2019-05-232-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add changelog Added wrong favicon
* | | | | | | | | | | | | | Merge branch '61880-download-btn-group' into 'master'Phil Hughes2019-05-232-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Group download buttons in a .btn-group Closes #61880 See merge request gitlab-org/gitlab-ce!28599
| * | | | | | | | | | | | | Group download buttons in a .btn-group61880-download-btn-groupAnnabel Dunstone Gray2019-05-232-1/+6
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'fix-import-member-access' into 'master'Jan Provaznik2019-05-234-1/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix issue importing members with owner access Closes #61715 See merge request gitlab-org/gitlab-ce!28636
| * | | | | | | | | | | | | Fix issue importing members with owner accessJames Lopez2019-05-234-1/+18
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'add-note-for-fk-with-index' into 'master'Marcia Ramos2019-05-231-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add note for index requirement with FK constraint in migration_style_guide.md See merge request gitlab-org/gitlab-ce!28003
| * | | | | | | | | | | | | Add note for index requirement with FK constraintShinya Maeda2019-05-231-1/+5
|/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update migration_style_guide.md
* | | | | | | | | | | | | Merge branch '49041-issue-board-input-height' into 'master'Phil Hughes2019-05-232-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduce height of issue board input to align with buttons Closes #49041 See merge request gitlab-org/gitlab-ce!28604
| * | | | | | | | | | | | | Reduce height of issue board input to align with buttons49041-issue-board-input-heightAnnabel Dunstone Gray2019-05-222-1/+6
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'update-smileys-new' into 'master'Annabel Dunstone Gray2019-05-2312-29/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update new smiley icons Closes #62054 See merge request gitlab-org/gitlab-ce!28338
| * | | | | | | | | | | | | Update smiley icons to new onesJarek Ostrowski2019-05-2312-29/+27
|/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add new emoji icons Remove added SVGs Change to sprite_icons Prettify Fix text left behind Fix errors Remove background top level reaction icon
* | | | | | | | | | | | | Merge branch 'relative-urls-for-system-notes' into 'master'Sean McGivern2019-05-233-8/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change system notes to use relative urls Closes #55441 See merge request gitlab-org/gitlab-ce!28588
| * | | | | | | | | | | | Change system notes to use relative urlsLuke Picciau2019-05-233-8/+13
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'docs-scope-stage-labels' into 'master'Rémy Coutable2019-05-231-20/+19
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stage labels are now scoped See merge request gitlab-org/gitlab-ce!28652
| * | | | | | | | | | | | Stage labels are now scopedRémy Coutable2019-05-231-20/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | | Merge branch 'master' into 'master'Marcia Ramos2019-05-231-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The pipeline hook uses 'builds' instead of 'jobs' in its request body See merge request gitlab-org/gitlab-ce!28482
| * | | | | | | | | | | | The pipeline hook uses 'builds' instead of 'jobs' in its request bodySese Schneider2019-05-231-1/+1
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'docs-scope-group-labels' into 'master'Rémy Coutable2019-05-231-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Group labels are now scoped labels See merge request gitlab-org/gitlab-ce!28645
| * | | | | | | | | | | | Group labels are now scoped labelsMark Fletcher2019-05-231-2/+2
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch '10443-ee-diff-commits-commit' into 'master'Phil Hughes2019-05-231-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move EE differences for `app/views/projects/commits/_commit.html.haml` See merge request gitlab-org/gitlab-ce!28548
| * | | | | | | | | | | | Move EE differences for `app/views/projects/commits/_commit.html.haml`Natalia Tepluhina2019-05-231-0/+4
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'bvl-reenable-code-owners' into 'master'Douwe Maan2019-05-231-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-enable codeowners See merge request gitlab-org/gitlab-ce!28585