summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Prevent premailer from converting HTML entities55964-fix-email-encodingHeinrich Lee Yu2019-04-042-1/+15
* Merge branch '59942-fix-mr-swipe-diff-user-select' into 'master'Phil Hughes2019-04-032-4/+8
|\
| * MR image diff swipe view: Disable user-select on dragftab2019-04-032-4/+8
|/
* Merge branch 'remaining-lib-differences' into 'master'Robert Speicher2019-04-031-0/+27
|\
| * Backport EE changes to gitlab:env:inforemaining-lib-differencesYorick Peterse2019-04-021-0/+27
* | Merge branch 'feature/webide_escaping' into 'master'Nick Thomas2019-04-035-11/+36
|\ \
| * | Merge branch 'feature/webide_escaping' of gitlab.com:hiddentiger/gitlab-ce in...Kieran Andrews2019-04-035-11/+36
|/ /
* | Merge branch '52560-fix-duplicate-tag-system-hooks' into 'master'Rémy Coutable2019-04-033-12/+19
|\ \
| * | Only execute system hooks once when pushing tagsNick Thomas2019-04-033-12/+19
* | | Merge branch '59756-shared-example-already-defined' into 'master'Sean McGivern2019-04-031-85/+0
|\ \ \
| * | | Remove already defined shared example59756-shared-example-already-definedAlexandru Croitor2019-04-021-85/+0
| | |/ | |/|
* | | Merge branch 'ce-fj-10179-add-ports-to-web-ide-config' into 'master'Kamil Trzciński2019-04-0326-27/+997
|\ \ \
| * | | Add port section to CI Image objectFrancisco Javier López2019-04-0326-27/+997
|/ / /
* | | Merge branch 'patch-50' into 'master'Kamil Trzciński2019-04-031-0/+2
|\ \ \
| * | | docs: add gitlab version for list jobs of a runnerjk2K2019-04-011-0/+2
* | | | Merge branch '55268-exclude-system-notes-from-commits-in-mr' into 'master'Rémy Coutable2019-04-033-9/+23
|\ \ \ \
| * | | | Do not show system notes on commits in the MR page55268-exclude-system-notes-from-commits-in-mrHeinrich Lee Yu2019-04-023-9/+23
* | | | | Merge branch '47234-composable-auto-devops' into 'master'Dmitriy Zaporozhets2019-04-0314-915/+793
|\ \ \ \ \
| * | | | | Add required variables to Jobs/Build.gitlab-ci.yml47234-composable-auto-devopsTiger2019-04-022-11/+20
| * | | | | Add docs for including individual Auto-DevOps jobsTiger2019-04-022-0/+20
| * | | | | Split Security Auto DevOps jobs into templatesTiger2019-04-027-253/+86
| * | | | | Split non-security Auto-DevOps jobs into templatesTiger2019-04-026-662/+678
* | | | | | Merge branch '59498-add-troubleshooting-section-to-capture-errors-with-instal...Evan Read2019-04-031-6/+23
|\ \ \ \ \ \
| * | | | | | Resolve "Add troubleshooting section to capture errors with installing applic...Alexander Strachan2019-04-031-6/+23
|/ / / / / /
* | | | | | Merge branch '54621_missing_example' into 'master'Grzegorz Bizon2019-04-031-0/+4
|\ \ \ \ \ \
| * | | | | | Add missing 'export' example for CI_API_V4_API_URLOlliver Schinagl2019-04-021-0/+4
* | | | | | | Merge branch '53459-quick-action-adds-multiple-labels-to-issue-if-middle-word...Sean McGivern2019-04-034-4/+63
|\ \ \ \ \ \ \
| * | | | | | | Fix quick actions add label name middle word overlaps53459-quick-action-adds-multiple-labels-to-issue-if-middle-words-overlap-with-existing-labelJacopo2019-04-024-4/+63
* | | | | | | | Merge branch 'ekigbo-extend-timezone-dropdown' into 'master'Filipa Lacerda2019-04-034-26/+205
|\ \ \ \ \ \ \ \
| * | | | | | | | Extend timezone dropdownEzekiel Kigbo2019-04-034-26/+205
|/ / / / / / / /
* | | | | | | | Merge branch 'fix-broken-master-release-permission-ce' into 'master'Rémy Coutable2019-04-031-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix Release permission specShinya Maeda2019-04-031-2/+2
* | | | | | | | | Merge branch 'fixed-duplicated-large-text-on-diffs' into 'master'Filipa Lacerda2019-04-034-12/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fixes duplicate diff too large error messagesPhil Hughes2019-04-024-12/+8
* | | | | | | | | | Merge branch 'leipert-resolve-fe-dependency-conflict-ce' into 'master'Filipa Lacerda2019-04-032-2/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Resolve CE/EE difference in FE dependency filesleipert-resolve-fe-dependency-conflict-ceLukas Eipert2019-04-022-2/+4
* | | | | | | | | | | Merge branch 'gl-set-up-gitlab-ui-danger-reviewer' into 'master'Tim Zallmann2019-04-033-1/+59
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Set specific reviewers for the GitLab UI WG effortgl-set-up-gitlab-ui-danger-reviewerFilipa Lacerda2019-03-293-1/+59
* | | | | | | | | | | | Merge branch '47771-highlighting-in-diff' into 'master'Tim Zallmann2019-04-032-0/+13
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Enabled text selection in diffs in Web IDE47771-highlighting-in-diffDenys Mishunov2019-03-282-0/+13
* | | | | | | | | | | | | Merge branch 'patch-49' into 'master'Phil Hughes2019-04-031-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix comment typoSergiu Marton2019-04-021-1/+1
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'patch-49' into 'master'Evan Read2019-04-031-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | remove html tagWilliam Chia2019-04-021-1/+1
* | | | | | | | | | | | | Merge branch 'docs/ci-refs-at-symbol' into 'master'Evan Read2019-04-031-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Document matching refs with an at-symbolCody Mize2019-04-031-0/+5
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'fix-format-typo-two-factor-auth' into 'master'Evan Read2019-04-031-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix format typo on generate-new-recovery-codes-using-sshAgustin Henze2019-04-021-0/+1
* | | | | | | | | | | | | | Merge branch 'doc/fix-typo-on-tests-style-guide' into 'master'Sanad Liaquat2019-04-031-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Fix typo on tests style guidedoc/fix-typo-on-tests-style-guideWalmyr Lima2019-04-021-1/+1
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |