summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add changes to match eevrt-mr-update-ce-backportsarahghp2019-05-233-16/+18
* Merge branch 'sh-fix-omniauth-generic-strategy' into 'master'Douglas Barbosa Alexandre2019-05-233-1/+41
|\
| * Fix OmniAuth OAuth2Generic strategy not loadingStan Hu2019-05-233-1/+41
* | Merge branch 'js-i18n-lib' into 'master'Clement Ho2019-05-233-14/+47
|\ \
| * | Internationalisation of lib directoryBrandon Labuschagne2019-05-233-14/+47
|/ /
* | Merge branch 'fe-docs-utility-first' into 'master'Clement Ho2019-05-231-8/+32
|\ \
| * | 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-headerErik van der Gaag2019-05-232-1/+5
|/ / /
* | | Merge branch 'docs/improve-writing-tests-doc' into 'master'Tanya Pazitny2019-05-231-3/+3
|\ \ \
| * | | 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
* | | | Merge branch 'nfriend-ignore-rubocop-cache-files' into 'master'Stan Hu2019-05-231-0/+1
|\ \ \ \
| * | | | Ignore tmp/rubocop_cache directoriesnfriend-ignore-rubocop-cache-filesNathan Friend2019-05-231-0/+1
* | | | | Merge branch '58869-unified-fe-test-script' into 'master'Clement Ho2019-05-233-6/+136
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Update FE test script58869-unified-fe-test-scriptPaul Slaughter2019-05-131-22/+59
| * | | | Add empty test suite flag to karma wrapperPaul Slaughter2019-05-131-5/+21
| * | | | Create a unified script to run Jest & Karma testsPaul Gascou-Vaillancourt2019-05-132-1/+78
* | | | | Merge branch 'docs/ssot_cicd_settings' into 'master'Marcia Ramos2019-05-231-0/+16
|\ \ \ \ \
| * | | | | 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 SSOTRussell Dickenson2019-05-231-3/+21
|/ / / / /
* | | | | Merge branch 'docs/ssot_external_auth' into 'master'Marcia Ramos2019-05-231-0/+16
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | 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 variablesMathieu Parent2019-05-225-4/+21
* | | | | Merge branch 'patch-65' into 'master'Rémy Coutable2019-05-231-2/+2
|\ \ \ \ \
| * | | | | 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.0Lukas 'Eipi' Eipert2019-05-232-169/+23
* | | | | | | Merge branch '59026-replace-favicon' into 'master'Phil Hughes2019-05-232-0/+5
|\ \ \ \ \ \ \
| * | | | | | | Add new favicon59026-replace-faviconJarek Ostrowski2019-05-232-0/+5
* | | | | | | | Merge branch '61880-download-btn-group' into 'master'Phil Hughes2019-05-232-1/+6
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | 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 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 constraintShinya Maeda2019-05-231-1/+5
|/ / / / / / /
* | | | | | | Merge branch '49041-issue-board-input-height' into 'master'Phil Hughes2019-05-232-1/+6
|\ \ \ \ \ \ \
| * | | | | | | 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 smiley icons to new onesJarek Ostrowski2019-05-2312-29/+27
|/ / / / / / /
* | | | | | | Merge branch 'relative-urls-for-system-notes' into 'master'Sean McGivern2019-05-233-8/+13
|\ \ \ \ \ \ \
| * | | | | | | 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 scopedRémy Coutable2019-05-231-20/+19
* | | | | | | | Merge branch 'master' into 'master'Marcia Ramos2019-05-231-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |