summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | Print notes number explained.Vladislav Kaverin2017-09-082-1/+7
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Printing just `[<number>]` was confusing - it looks like a ghost branch or something. Add `note` (or `notes`, depending on number of notes) to give some details of what this number means. Refactor code to follow DRY principle.
* | | | | | | Merge branch 'patch-18' into 'master'Rémy Coutable2017-09-081-2/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clarify that only some Runner Executors have these security concerns See merge request !14068
| * | | | | | | 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 jobs See merge request !14133
| * | | | | | | 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
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move issues index variable setting to a method See merge request !14048
| * \ \ \ \ \ \ 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it easier to reuse in EE.
* | | | | | | | | Merge branch ↵Rémy Coutable2017-09-082-1/+21
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '37569-fix-wrong-number-of-arguments-in-tree_helper-flatten_tree' into 'master' Fix a "Wrong number of arguments" error in TreeHelper#flatten_tree Closes #37569 See merge request !14119
| * | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | Merge branch 'support-additional-colors' into 'master'Tim Zallmann2017-09-0810-72/+101
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Supports additional colors and labels for the prometheus monitoring dashboard Closes #34629 See merge request !14065
| * | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update master with 9.5.4 security patches See merge request !14131
| * | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update GitLab Pages (9.5) See merge request !2159
| * | | | | | | | | | Merge branch 'fix-user-select-dropdown-escaping' into 'security-9-5'Clement Ho2017-09-071-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes the User Selection Display (9.5) See merge request gitlab/gitlabhq!2177
| * | | | | | | | | | Merge branch 'rs-issue-36104' into 'security-9-5'Douwe Maan2017-09-078-8/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [9.5] Disallow the `name` attribute on all user-provided markup See merge request gitlab/gitlabhq!2166
| * | | | | | | | | | Merge branch 'rs-issue-36098' into 'security-9-5'Robert Speicher2017-09-073-4/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [9.5] Limit `style` attribute on `th` and `td` elements to specific properties See merge request gitlab/gitlabhq!2155
| * | | | | | | | | | Merge branch '29943-environment-folder' into 'security-9-5'Kamil Trzciński2017-09-079-124/+161
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not use `location.pathname` when accessing environments folders See merge request !2147
| * | | | | | | | | | Merge branch 'fix-escape-commit-block' into 'security-9-5'Douwe Maan2017-09-073-3/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [9.5] Prevent a persistent XSS in the commit author block See merge request gitlab/gitlabhq!2180
| * | | | | | | | | | Merge branch 'fix-comment-reflection' into 'security-9-5'Jacob Schatz2017-09-072-4/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Live Comment XSS Vulnerability See merge request gitlab/gitlabhq!2183
| * | | | | | | | | | Merge branch 'dm-go-get-xss' into 'security-9-3'Robert Speicher2017-09-073-11/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix XSS issue in go-get handling See merge request !2128
* | | | | | | | | | | Merge branch '37550-improve-clarity-of-helm-chart-docs' into 'master'Achilleas Pipinellis2017-09-084-39/+54
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve clarity of Helm Chart docs Closes #37550 See merge request !14100
| * | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | | | | Update CHANGELOG.md for 9.4.6Jose Ivan Vargas2017-09-061-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | | | | Update CHANGELOG.md for 9.3.11Jose Ivan Vargas2017-09-062-5/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | | Merge branch 'jk-update-schema' into 'master'rd-testYorick Peterse2017-09-071-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update db schema to correspond with migrations See merge request !14115
| * | | | | | | | | | | | Update db schema to correspond with migrationsjk-update-schemaJarka Kadlecova2017-09-071-1/+1
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch ↵Clement Ho2017-09-073-6/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '36638-select-project-to-create-issue-button-is-disconnected-from-dropdown-button' into 'master' Normalize styles for empty-state group-level new issue/MR combo button Closes #36638 See merge request !13647
| * | | | | | | | | | | | Normalize styles for empty-state group-level new issue/MR combo buttonBryce Johnson2017-09-073-6/+24
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch ↵Douwe Maan2017-09-079-31/+235
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '30473-allow-creation-of-subgroups-with-gitlab_default_can_create_group-set-to-false' into 'master' Make Members with Owner and Master roles always able to create subgroups Closes #30473 See merge request !14046
| * | | | | | | | | | | | Make Members with Owner and Master roles always able to create subgroups30473-allow-creation-of-subgroups-with-gitlab_default_can_create_group-set-to-falseRuben Davila2017-09-079-31/+235
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'docs/autodevops' into 'master'Kamil Trzciński2017-09-0711-10/+455
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Auto DevOps docs Closes #37051 See merge request !14031
| * | | | | | | | | | | | Add Auto DevOps docsAchilleas Pipinellis2017-09-0711-10/+455
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'zj-update-rails-template' into 'master'Kamil Trzciński2017-09-072-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update rails template to include postgres Closes #37156 See merge request !14120
View Lorry Controller Status