| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Fixed changes bar jumping on merge requestschanges-tab-jumping | Phil Hughes | 2017-09-08 | 2 | -1/+6 |
| | | | | | Closes #37589 | ||||
| * | Merge branch 'docs-new-topic-projects-settings' into 'master' | Achilleas Pipinellis | 2017-09-08 | 8 | -5/+80 |
| |\ | | | | | | | | | | | | | Docs new index for project's settings Closes #35719 See merge request !13552 | ||||
| | * | Docs new index for project's settings | Marcia Ramos | 2017-09-08 | 8 | -5/+80 |
| |/ | |||||
| * | Merge branch 'fix-tooltip-width-issue-board' into 'master' | Phil Hughes | 2017-09-08 | 2 | -1/+6 |
| |\ | | | | | | | | | Fix tooltip width on collapsed issue board column titles See merge request !14129 | ||||
| | * | Fix tooltip width on collapsed issue board column titles | Jedidiah | 2017-09-08 | 2 | -1/+6 |
| |/ | |||||
| * | Merge branch 'docs/yaml-hidden-keys' into 'master' | Marcia Ramos | 2017-09-08 | 1 | -11/+17 |
| |\ | | | | | | | | | | | | | Clarify yaml hidden keys (jobs) Closes #37480 See merge request !14110 | ||||
| | * | Clarify yaml hidden keys (jobs)docs/yaml-hidden-keys | Achilleas Pipinellis | 2017-09-08 | 1 | -11/+17 |
| | | | |||||
| * | | Merge branch 'uipolish-fix-2factor-warning' into 'master' | Sean McGivern | 2017-09-08 | 2 | -6/+11 |
| |\ \ | | | | | | | | | | | | | Tweak column widths on two factor warning messages See merge request !14112 | ||||
| | * | | Tweak column widths on two factor warning messages | Jedidiah | 2017-09-08 | 2 | -6/+11 |
| |/ / | |||||
| * | | Merge branch 'vue-eslint' into 'master' | Phil Hughes | 2017-09-08 | 1 | -7/+18 |
| |\ \ | | | | | | | | | | | | | | | | | | | Adds a better explanation for alignment section Closes #32071 See merge request !14109 | ||||
| | * | | Adds a better explanation for alignment section | Filipa Lacerda | 2017-09-08 | 1 | -7/+18 |
| |/ / | |||||
| * | | Merge branch '37618-wrong-link-for-write-test-in-contributing-md' into 'master' | Rémy Coutable | 2017-09-08 | 1 | -1/+1 |
| |\ \ | | | | | | | | | | | | | | | | | | | Resolve "Wrong link for write test in CONTRIBUTING.md" Closes #37618 See merge request !14138 | ||||
| | * | | Fix wrong link in CONTRIBUTING.md | Achilleas Pipinellis | 2017-09-08 | 1 | -1/+1 |
| | | | | | | | | | | [ci skip] | ||||
| * | | | Merge branch 'gpg' into 'master' | Rémy Coutable | 2017-09-08 | 1 | -2/+2 |
| |\ \ \ | | | | | | | | | | | | | | | | | update gpg_signed_commit to use 0xLONG format for gpg list keys See merge request !13839 | ||||
| | * | | | update gpg_signed_commit to use 0xLONG format for gpg list keys | Kevin Pankonen | 2017-09-07 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Merge branch 'bugfix/graph-friendly-notes-number' into 'master' | Rémy Coutable | 2017-09-08 | 2 | -1/+7 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Print notes number explained in the graph. Closes #37224 See merge request !13949 | ||||
| | * | | | | Print notes number explained. | Vladislav Kaverin | 2017-09-08 | 2 | -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 Coutable | 2017-09-08 | 1 | -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 concerns | Ben Bodenmiller | 2017-09-06 | 1 | -2/+4 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'docs/exclude-migration-path-jobs' into 'master' | Rémy Coutable | 2017-09-08 | 1 | -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-jobs | Achilleas Pipinellis | 2017-09-08 | 1 | -0/+1 |
| | | |/ / / | |/| | | | |||||
| * | | | | | Merge branch 'backport-issues-controller-changes' into 'master' | Sean McGivern | 2017-09-08 | 6 | -18/+58 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Move issues index variable setting to a method See merge request !14048 | ||||
| | * \ \ \ \ | Merge branch 'master' into backport-issues-controller-changesbackport-issues-controller-changes | Bryce Johnson | 2017-09-07 | 199 | -614/+3573 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | Don't backport changes to nav_btns. | Bryce Johnson | 2017-09-07 | 1 | -11/+2 |
| | | | | | | | | |||||
| | * | | | | | | Backport getAllParams and other nav changes from service desk. | Bryce Johnson | 2017-09-07 | 5 | -6/+52 |
| | | | | | | | | |||||
| | * | | | | | | Move issues index variable setting to a method | Sean McGivern | 2017-09-07 | 2 | -14/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it easier to reuse in EE. | ||||
| * | | | | | | | Merge branch ↵ | Rémy Coutable | 2017-09-08 | 2 | -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_tree | Rémy Coutable | 2017-09-07 | 2 | -1/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | | | | | | | Merge branch 'support-additional-colors' into 'master' | Tim Zallmann | 2017-09-08 | 10 | -72/+101 |
| |\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Supports additional colors and labels for the prometheus monitoring dashboard Closes #34629 See merge request !14065 | ||||
| | * | | | | | | | flipped series and when keys | Jose Ivan Vargas | 2017-09-07 | 1 | -2/+2 |
| | | | | | | | | | |||||
| | * | | | | | | | Changed how the backend response is handled for when instead of series | Jose Ivan Vargas | 2017-09-07 | 4 | -7/+6 |
| | | | | | | | | | |||||
| | * | | | | | | | addressed code quality observations | Jose Ivan Vargas | 2017-09-07 | 1 | -25/+12 |
| | | | | | | | | | |||||
| | * | | | | | | | refactored the pickColors method | Jose Ivan Vargas | 2017-09-07 | 1 | -15/+18 |
| | | | | | | | | | |||||
| | * | | | | | | | Improved color selector and addressed observations | Jose Ivan Vargas | 2017-09-07 | 2 | -51/+38 |
| | | | | | | | | | |||||
| | * | | | | | | | Added CHANGELOG | Jose Ivan Vargas | 2017-09-07 | 2 | -17/+5 |
| | | | | | | | | | |||||
| | * | | | | | | | Added minor details to specs | Jose Ivan Vargas | 2017-09-07 | 3 | -5/+22 |
| | | | | | | | | | |||||
| | * | | | | | | | small fixes to code and specs | Jose Ivan Vargas | 2017-09-07 | 4 | -41/+25 |
| | | | | | | | | | |||||
| | * | | | | | | | Added specs for the additional color support | Jose Ivan Vargas | 2017-09-07 | 4 | -7/+22 |
| | | | | | | | | | |||||
| | * | | | | | | | Added support for named colors, also added interpolations for the graphs | Jose Ivan Vargas | 2017-09-07 | 4 | -17/+85 |
| | | | | | | | | | |||||
| | * | | | | | | | Renamed some components | Jose Ivan Vargas | 2017-09-07 | 6 | -43/+24 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch 'rs-pick-security-into-master' into 'master' | Douwe Maan | 2017-09-08 | 23 | -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-master | Robert Speicher | 2017-09-07 | 5 | -21/+0 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Merge branch 'update-pages-9-5' into 'security-9-5' | Douwe Maan | 2017-09-07 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update GitLab Pages (9.5) See merge request !2159 | ||||
| | * | | | | | | | | Merge branch 'fix-user-select-dropdown-escaping' into 'security-9-5' | Clement Ho | 2017-09-07 | 1 | -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 Maan | 2017-09-07 | 8 | -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 Speicher | 2017-09-07 | 3 | -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ński | 2017-09-07 | 9 | -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 Maan | 2017-09-07 | 3 | -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 Schatz | 2017-09-07 | 2 | -4/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Live Comment XSS Vulnerability See merge request gitlab/gitlabhq!2183 | ||||
| | * | | | | | | | | Merge branch 'dm-go-get-xss' into 'security-9-3' | Robert Speicher | 2017-09-07 | 3 | -11/+44 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix XSS issue in go-get handling See merge request !2128 | ||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |