summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Backport the EE signature of Gitlab::Workhorse#send_artifacts_entryrc/backport-workhorse-send_artifacts_entry-signature-from-eeRémy Coutable2017-09-081-2/+2
* Merge branch '37618-wrong-link-for-write-test-in-contributing-md' into 'master'Rémy Coutable2017-09-081-1/+1
|\
| * Fix wrong link in CONTRIBUTING.mdAchilleas Pipinellis2017-09-081-1/+1
* | Merge branch 'gpg' into 'master'Rémy Coutable2017-09-081-2/+2
|\ \
| * | update gpg_signed_commit to use 0xLONG format for gpg list keysKevin Pankonen2017-09-071-2/+2
* | | Merge branch 'bugfix/graph-friendly-notes-number' into 'master'Rémy Coutable2017-09-082-1/+7
|\ \ \
| * | | Print notes number explained.Vladislav Kaverin2017-09-082-1/+7
* | | | Merge branch 'patch-18' into 'master'Rémy Coutable2017-09-081-2/+4
|\ \ \ \
| * | | | clarify that only some Runner Executors have these security concernsBen Bodenmiller2017-09-061-2/+4
* | | | | Merge branch 'docs/exclude-migration-path-jobs' into 'master'Rémy Coutable2017-09-081-0/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Exclude migration-paths job when executing docs-only jobsdocs/exclude-migration-path-jobsAchilleas Pipinellis2017-09-081-0/+1
| | |/ / | |/| |
* | | | Merge branch 'backport-issues-controller-changes' into 'master'Sean McGivern2017-09-086-18/+58
|\ \ \ \
| * \ \ \ Merge branch 'master' into backport-issues-controller-changesbackport-issues-controller-changesBryce Johnson2017-09-07199-614/+3573
| |\ \ \ \
| * | | | | Don't backport changes to nav_btns.Bryce Johnson2017-09-071-11/+2
| * | | | | Backport getAllParams and other nav changes from service desk.Bryce Johnson2017-09-075-6/+52
| * | | | | Move issues index variable setting to a methodSean McGivern2017-09-072-14/+17
* | | | | | Merge branch '37569-fix-wrong-number-of-arguments-in-tree_helper-flatten_tree...Rémy Coutable2017-09-082-1/+21
|\ \ \ \ \ \
| * | | | | | Fix a "Wrong number of arguments" error in TreeHelper#flatten_tree37569-fix-wrong-number-of-arguments-in-tree_helper-flatten_treeRémy Coutable2017-09-072-1/+21
* | | | | | | Merge branch 'support-additional-colors' into 'master'Tim Zallmann2017-09-0810-72/+101
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | flipped series and when keysJose Ivan Vargas2017-09-071-2/+2
| * | | | | | Changed how the backend response is handled for when instead of seriesJose Ivan Vargas2017-09-074-7/+6
| * | | | | | addressed code quality observationsJose Ivan Vargas2017-09-071-25/+12
| * | | | | | refactored the pickColors methodJose Ivan Vargas2017-09-071-15/+18
| * | | | | | Improved color selector and addressed observationsJose Ivan Vargas2017-09-072-51/+38
| * | | | | | Added CHANGELOGJose Ivan Vargas2017-09-072-17/+5
| * | | | | | Added minor details to specsJose Ivan Vargas2017-09-073-5/+22
| * | | | | | small fixes to code and specsJose Ivan Vargas2017-09-074-41/+25
| * | | | | | Added specs for the additional color supportJose Ivan Vargas2017-09-074-7/+22
| * | | | | | Added support for named colors, also added interpolations for the graphsJose Ivan Vargas2017-09-074-17/+85
| * | | | | | Renamed some componentsJose Ivan Vargas2017-09-076-43/+24
* | | | | | | Merge branch 'rs-pick-security-into-master' into 'master'Douwe Maan2017-09-0823-161/+307
|\ \ \ \ \ \ \
| * | | | | | | Remove changelogs we've already released in the security patchesrs-pick-security-into-masterRobert Speicher2017-09-075-21/+0
| * | | | | | | Merge branch 'update-pages-9-5' into 'security-9-5'Douwe Maan2017-09-071-1/+1
| * | | | | | | Merge branch 'fix-user-select-dropdown-escaping' into 'security-9-5'Clement Ho2017-09-071-6/+6
| * | | | | | | Merge branch 'rs-issue-36104' into 'security-9-5'Douwe Maan2017-09-078-8/+23
| * | | | | | | Merge branch 'rs-issue-36098' into 'security-9-5'Robert Speicher2017-09-073-4/+42
| * | | | | | | Merge branch '29943-environment-folder' into 'security-9-5'Kamil Trzciński2017-09-079-124/+161
| * | | | | | | Merge branch 'fix-escape-commit-block' into 'security-9-5'Douwe Maan2017-09-073-3/+30
| * | | | | | | Merge branch 'fix-comment-reflection' into 'security-9-5'Jacob Schatz2017-09-072-4/+21
| * | | | | | | Merge branch 'dm-go-get-xss' into 'security-9-3'Robert Speicher2017-09-073-11/+44
* | | | | | | | Merge branch '37550-improve-clarity-of-helm-chart-docs' into 'master'Achilleas Pipinellis2017-09-084-39/+54
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Improve clarity of Helm Chart docsJoshua Lambert2017-09-084-39/+54
|/ / / / / / /
* | | | | | | Merge remote-tracking branch 'dev/master'Robert Speicher2017-09-072-5/+40
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into dev-masterDJ Mountney2017-09-06321-2793/+6549
| |\ \ \ \ \ \ \
| * | | | | | | | Update CHANGELOG.md for 9.5.4Jose Ivan Vargas2017-09-061-0/+10
| * | | | | | | | Update CHANGELOG.md for 9.4.6Jose Ivan Vargas2017-09-061-0/+12
| * | | | | | | | Update CHANGELOG.md for 9.3.11Jose Ivan Vargas2017-09-062-5/+18
* | | | | | | | | Merge branch 'jk-update-schema' into 'master'rd-testYorick Peterse2017-09-071-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update db schema to correspond with migrationsjk-update-schemaJarka Kadlecova2017-09-071-1/+1
* | | | | | | | | | Merge branch '36638-select-project-to-create-issue-button-is-disconnected-fro...Clement Ho2017-09-073-6/+24
|\ \ \ \ \ \ \ \ \ \