summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Apply suggestion to scripts/foss-sync.shmj/single-codebase-foss-syncMarin Jankovski2019-07-251-1/+1
* Syncing to the FOSS repo from a single codebaseMarin Jankovski2019-07-043-0/+70
* Merge branch '12368-main-js' into 'master'Phil Hughes2019-07-042-0/+3
|\
| * Resolve CE/EE diff in main.js12368-main-jsLukas Eipert2019-07-042-0/+3
* | Merge branch 'nfriend-make-haml-tooltip-delay-user-configurable' into 'master'Fatih Acet2019-07-041-0/+4
|\ \
| * | Allow (Haml) tooltip delay customization via localStoragenfriend-make-haml-tooltip-delay-user-configurableNathan Friend2019-06-281-0/+4
* | | Merge branch 'refactor-pipeline-errors_message-ce' into 'master'Kamil Trzciński2019-07-043-1/+29
|\ \ \
| * | | Refactor pipeline errors_messagerefactor-pipeline-errors_message-ceShinya Maeda2019-07-043-1/+29
* | | | Merge branch 'winh-boards-switcher-mounting' into 'master'Kushal Pandya2019-07-042-0/+5
|\ \ \ \
| * | | | Extract mounting of multiple boards switcherWinnie Hellmann2019-07-042-0/+5
|/ / / /
* | | | Merge branch 'qa-dequarantine-create-merge_request' into 'master'Ramya Authappan2019-07-041-2/+1
|\ \ \ \
| * | | | Removing Quarantine tag after testingTomislav Nikic2019-07-041-2/+1
* | | | | Merge branch 'vue-i18n-js-sidebar-directory' into 'master'Filipa Lacerda2019-07-048-29/+99
|\ \ \ \ \
| * | | | | Vue-i18n: app/assets/javascripts/sidebar directoryEzekiel Kigbo2019-07-048-29/+99
|/ / / / /
* | | | | Merge branch '63873-process-start-time' into 'master'Douwe Maan2019-07-046-34/+21
|\ \ \ \ \
| * | | | | Fix process start timeRyan Cobb2019-07-046-34/+21
|/ / / / /
* | | | | Merge branch 'vue-i18n-js-notes-directory' into 'master'Filipa Lacerda2019-07-0410-50/+138
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Vue-i18n: app/assets/javascripts/notes directoryEzekiel Kigbo2019-07-0410-50/+138
|/ / / /
* | | | Merge branch 'issue-63222' into 'master'Lin Jen-Shin2019-07-043-2/+23
|\ \ \ \
| * | | | Set default project sort method prior to initial sort on page loadingDavid Palubin2019-07-043-2/+23
|/ / / /
* | | | Merge branch 'fix-mwps-shows-inconsistent-sha-ce' into 'master'Douwe Maan2019-07-045-5/+13
|\ \ \ \
| * | | | Fix MWPS system notes shows inconsistent shafix-mwps-shows-inconsistent-sha-ceShinya Maeda2019-07-045-5/+13
| | |/ / | |/| |
* | | | Merge branch 'id-groups-in-codeowners' into 'master'Douwe Maan2019-07-044-138/+13
|\ \ \ \
| * | | | Backports for EE's "Allow adding groups to CODEOWNERS file"Igor2019-07-044-138/+13
|/ / / /
* | | | Merge branch 'docs-remove-DOCKER_AUTH_CONFIG' into 'master'Achilleas Pipinellis2019-07-041-4/+4
|\ \ \ \
| * | | | Replace the variable DOCKER_AUTH_LOGIN with DOCKER_AUTH_CONFIG Alexander Tanayno2019-07-041-4/+4
* | | | | Merge branch 'little-cluster-health-charts-ce' into 'master'Phil Hughes2019-07-046-141/+117
|\ \ \ \ \
| * | | | | Use gl-empty-state for monitor chartslittle-cluster-health-charts-ceSimon Knox2019-07-046-141/+117
| | |/ / / | |/| | |
* | | | | Merge branch 'ce-jej/fix-group-saml-u2f' into 'master'James Lopez2019-07-044-11/+29
|\ \ \ \ \
| * | | | | OmniAuth full_host spec helperJames Edwards-Jones2019-07-044-11/+29
|/ / / / /
* | | | | Merge branch 'docs-link-access-control-pages' into 'master'Achilleas Pipinellis2019-07-041-1/+1
|\ \ \ \ \
| * | | | | Docs: Clearly state "access control" from Pages indexMarcia Ramos2019-07-041-1/+1
|/ / / / /
* | | | | Merge branch 'patch-71' into 'master'Achilleas Pipinellis2019-07-041-1/+1
|\ \ \ \ \
| * | | | | Fix incorrect link for prometheus AWS CloudWatch exporterMaxim Efimov2019-07-021-1/+1
* | | | | | Merge branch 'docs-api-docs-followup-1' into 'master'Achilleas Pipinellis2019-07-049-210/+231
|\ \ \ \ \ \
| * | | | | | Clean up EE api docs that were merged to CEMarcel Amirault2019-07-049-210/+231
|/ / / / / /
* | | | | | Merge branch 'sh-fix-issue-63349' into 'master'Rémy Coutable2019-07-045-3/+55
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Make Housekeeping button do a full garbage collectionsh-fix-issue-63349Stan Hu2019-07-035-3/+55
* | | | | | Merge branch 'docs-issues-followup' into 'master'Evan Read2019-07-044-41/+48
|\ \ \ \ \ \
| * | | | | | Resolve proclems with issues documentationMarcel Amirault2019-07-044-41/+48
|/ / / / / /
* | | | | | Merge branch '53357-fix-plus-in-upload-file-names' into 'master'Lin Jen-Shin2019-07-044-28/+43
|\ \ \ \ \ \
| * | | | | | Use #filename when generating upload URLs53357-fix-plus-in-upload-file-namesHeinrich Lee Yu2019-07-044-28/+43
* | | | | | | Merge branch 'qa-xss' into 'master'Mark Lapierre2019-07-047-0/+54
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | E2E Test to check XSS issue in @mentions autocompleteRamya Authappan2019-07-047-0/+54
|/ / / / / /
* | | | | | Merge branch 'docs-similar-issues-edit' into 'master'Evan Read2019-07-0426-377/+350
|\ \ \ \ \ \
| * | | | | | Fix notes and update links to issues docMarcel Amirault2019-07-0426-377/+350
|/ / / / / /
* | | | | | Merge branch 'sh-cache-flipper-checks-in-memory' into 'master'Douglas Barbosa Alexandre2019-07-043-3/+87
|\ \ \ \ \ \
| * | | | | | Cache Flipper feature flags in L1 and L2 cachessh-cache-flipper-checks-in-memoryStan Hu2019-07-033-3/+87
* | | | | | | Merge branch 'docs-environment-stop-git-strategy' into 'master'Evan Read2019-07-031-0/+6
|\ \ \ \ \ \ \
| * | | | | | | Update docs environment:action:stop GIT_STRATEGYdocs-environment-stop-git-strategyMark Lapierre2019-07-041-0/+6