summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* EE Backport to CE of Note Form EE Diffs9971-move-ee-differences-for-app-assets-javascripts-notes-components-note_form-vue-ceSam Bigelow2019-05-023-38/+103
* Merge branch 'tc-improve-db-process' into 'master'Andreas Brandl2019-05-021-3/+5
|\
| * Escape the usernames to avoid mentionsToon Claes2019-05-021-3/+5
* | Merge branch 'js-i18n-merge-conflict' into 'master'Fatih Acet2019-05-023-8/+37
|\ \
| * | Internationalisation of merge_conflicts directoryBrandon Labuschagne2019-05-023-8/+37
|/ /
* | Merge branch 'js-i18n-t-directories' into 'master'Fatih Acet2019-05-023-2/+11
|\ \ | |/ |/|
| * Internationalisation of javascript/t* directoriesBrandon Labuschagne2019-05-023-2/+11
|/
* Merge branch '59898-fix-the-following-style-lint-errors-and-warnings-for-app-...Filipa Lacerda2019-05-0214-62/+27
|\
| * Fix commits.scss style-lint errors59898-fix-the-following-style-lint-errors-and-warnings-for-app-assets-stylesheets-pages-commits-scssScott Hampton2019-04-2514-62/+27
* | Merge branch 'masked-variables-docs-update' into 'master'Filipa Lacerda2019-05-022-4/+6
|\ \
| * | Clarify masked variable message, add link to docsmasked-variables-docs-updatemfluharty2019-04-182-4/+6
* | | Merge branch '53064-bypassing-pipeline-jobs-by-canceling-the-pipeline-and-man...Douwe Maan2019-05-028-16/+24
|\ \ \
| * | | Apply suggestion to doc/ci/pipelines.md53064-bypassing-pipeline-jobs-by-canceling-the-pipeline-and-manually-running-later-jobsMiranda Fluharty2019-05-011-4/+2
| * | | Update documentation to explain job retryabilitymfluharty2019-04-231-0/+5
| * | | Update specs that use retryable canceled jobsmfluharty2019-04-195-15/+15
| * | | Make canceled jobs not retryablemfluharty2019-04-182-1/+6
* | | | Merge branch 'patch-52' into 'master'Marcia Ramos2019-05-021-1/+1
|\ \ \ \
| * | | | fix typoMorris-Chen2019-04-301-1/+1
* | | | | Merge branch 'jprovazn-graphql-opentracing' into 'master'Bob Van Landuyt2019-05-026-40/+90
|\ \ \ \ \
| * | | | | Add opentracing integration for graphqlJan Provaznik2019-05-026-40/+90
|/ / / / /
* | | | | Merge branch 'sh-allow-equal-level-in-subgroup-membership' into 'master'James Lopez2019-05-026-5/+20
|\ \ \ \ \
| * | | | | Allow a member to have an access level equal to parent groupsh-allow-equal-level-in-subgroup-membershipStan Hu2019-04-306-5/+20
* | | | | | Merge branch 'patch-52' into 'master'Evan Read2019-05-021-1/+1
|\ \ \ \ \ \
| * | | | | | Removes a typo in labels.md (Line 45)NoaHJ2019-05-011-1/+1
* | | | | | | Merge branch 'da-sentry-client-side-settings' into 'master'Stan Hu2019-05-016-3/+11
|\ \ \ \ \ \ \
| * | | | | | | Add CHANGELOG entryda-sentry-client-side-settingsDouglas Barbosa Alexandre2019-05-011-0/+5
| * | | | | | | Allow Sentry client-side DSN to be passed on gitlab.ymlDouglas Barbosa Alexandre2019-05-015-3/+6
* | | | | | | | Merge branch 'doc-patch-example-domain' into 'master'Evan Read2019-05-011-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Update GitHub integration instructions to swap example domain to *.example.co...Mike Lewis2019-05-011-1/+1
|/ / / / / / / /
* | | | | | | | Merge branch 'patch-51' into 'master'Evan Read2019-05-011-2/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Add example for the artifacts:paths sectionBlair Lunceford2019-05-011-2/+4
|/ / / / / / / /
* | | | | | | | Merge branch 'securitytxt' into 'master'John Northrup2019-05-011-0/+6
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Add a security txt https://securitytxt.org/Sid Sijbrandij2019-05-011-0/+6
* | | | | | | | Merge branch 'bertrand-lpl-master-patch-56649' into 'master'docs-subscription-changes-and-dataMike Lewis2019-05-011-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Replace misinterpreted `|` caracter in a table Bertrand Jamin2019-02-171-1/+1
* | | | | | | | | Merge branch 'js-i18n-notes' into 'master'Clement Ho2019-05-014-8/+31
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Internationalisation of notes directoryBrandon Labuschagne2019-05-014-8/+31
|/ / / / / / / / /
* | | | | | | | | Merge branch 'js-i18n-behaviors' into 'master'Clement Ho2019-05-015-6/+29
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Internationalisation of behaviors directoryBrandon Labuschagne2019-05-015-6/+29
|/ / / / / / / /
* | | | | | | | Merge branch 'js-i18n-board' into 'master'Clement Ho2019-05-015-5/+22
|\ \ \ \ \ \ \ \
| * | | | | | | | Internationalisation of board directoryBrandon Labuschagne2019-05-015-5/+22
|/ / / / / / / /
* | | | | | | | Merge branch 'js-i18n-filtered-search' into 'master'Clement Ho2019-05-019-18/+41
|\ \ \ \ \ \ \ \
| * | | | | | | | Internationalisation of filtered_search directoryBrandon Labuschagne2019-05-019-18/+41
|/ / / / / / / /
* | | | | | | | Merge branch '9962-ee-diff-note-actions' into 'master'Phil Hughes2019-05-012-9/+15
|\ \ \ \ \ \ \ \
| * | | | | | | | Resolve "Move EE differences for `app/assets/javascripts/notes/components/not...Natalia Tepluhina2019-05-012-9/+15
|/ / / / / / / /
* | | | | | | | Merge branch '10694-propagate-env-vars-only-if-set-ce' into 'master'Douwe Maan2019-05-012-18/+38
|\ \ \ \ \ \ \ \
| * | | | | | | | Propagate ENV vars to SAST and Dependency Scanning Docker containers only if ...Victor Zagorodny2019-05-012-18/+38
|/ / / / / / / /
* | | | | | | | Merge branch 'fj-refactor-mirror-instructions-view' into 'master'Sean McGivern2019-05-012-1/+5
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Refactor mirror instructions viewFrancisco Javier López2019-05-012-1/+5
|/ / / / / / /
* | | | | | | Merge branch 'bvl-upload-designs-fix-ce' into 'master'Douwe Maan2019-05-012-3/+11
|\ \ \ \ \ \ \
View Lorry Controller Status