Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | 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 | |||||
* | | | | | | | | | Merge branch '37550-improve-clarity-of-helm-chart-docs' into 'master' | Achilleas Pipinellis | 2017-09-08 | 4 | -39/+54 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve clarity of Helm Chart docs Closes #37550 See merge request !14100 | |||||
| * | | | | | | | | Improve clarity of Helm Chart docs | Joshua Lambert | 2017-09-08 | 4 | -39/+54 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge remote-tracking branch 'dev/master' | Robert Speicher | 2017-09-07 | 2 | -5/+40 | |
|\ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ | Merge remote-tracking branch 'origin/master' into dev-master | DJ Mountney | 2017-09-06 | 321 | -2793/+6549 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Update CHANGELOG.md for 9.5.4 | Jose Ivan Vargas | 2017-09-06 | 1 | -0/+10 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] | |||||
| * | | | | | | | | | Update CHANGELOG.md for 9.4.6 | Jose Ivan Vargas | 2017-09-06 | 1 | -0/+12 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] | |||||
| * | | | | | | | | | Update CHANGELOG.md for 9.3.11 | Jose Ivan Vargas | 2017-09-06 | 2 | -5/+18 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] | |||||
* | | | | | | | | | | Merge branch 'jk-update-schema' into 'master'rd-test | Yorick Peterse | 2017-09-07 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update db schema to correspond with migrations See merge request !14115 | |||||
| * | | | | | | | | | | Update db schema to correspond with migrationsjk-update-schema | Jarka Kadlecova | 2017-09-07 | 1 | -1/+1 | |
| | | | | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch ↵ | Clement Ho | 2017-09-07 | 3 | -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 button | Bryce Johnson | 2017-09-07 | 3 | -6/+24 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge branch ↵ | Douwe Maan | 2017-09-07 | 9 | -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-false | Ruben Davila | 2017-09-07 | 9 | -31/+235 | |
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch 'docs/autodevops' into 'master' | Kamil Trzciński | 2017-09-07 | 11 | -10/+455 | |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Auto DevOps docs Closes #37051 See merge request !14031 | |||||
| * | | | | | | | | | | | Add Auto DevOps docs | Achilleas Pipinellis | 2017-09-07 | 11 | -10/+455 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge branch 'zj-update-rails-template' into 'master' | Kamil Trzciński | 2017-09-07 | 2 | -0/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update rails template to include postgres Closes #37156 See merge request !14120 | |||||
| * | | | | | | | | | | | Update rails template to include postgreszj-update-rails-template | Zeger-Jan van de Weg | 2017-09-07 | 2 | -0/+5 | |
| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch ↵ | Douwe Maan | 2017-09-07 | 5 | -24/+154 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '35558-only-one-garbage-collection-should-be-running-per-project-at-once' into 'master' Adds exclusive lease to Git garbage collect worker. Closes #35558 See merge request !14036 | |||||
| * | | | | | | | | | | | Adds exclusive lease to Git garbage collect worker.35558-only-one-garbage-collection-should-be-running-per-project-at-once | Tiago Botelho | 2017-09-07 | 5 | -24/+154 | |
| | |_|_|/ / / / / / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch 'rs-trigger-build-docs-offenses' into 'master' | Rémy Coutable | 2017-09-07 | 1 | -6/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve RuboCop violations in scripts/trigger-build-docs See merge request !14118 | |||||
| * | | | | | | | | | | | Resolve RuboCop violations in scripts/trigger-build-docs | Robert Speicher | 2017-09-07 | 1 | -6/+6 | |
| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'winh-filter-dropdowns-keyboard-selection' into 'master' | Clement Ho | 2017-09-07 | 1 | -0/+11 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restore droplab item style for keyboard navigation Closes #37218 See merge request !13921 | |||||
| * | | | | | | | | | | | | Restore droplab item style for keyboard navigationwinh-filter-dropdowns-keyboard-selection | winh | 2017-09-06 | 1 | -0/+11 | |
| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'improve-share-locking-feature-for-subgroups' into 'master' | Douwe Maan | 2017-09-07 | 20 | -134/+861 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve "Share with group lock" feature for subgroups Closes #30550 See merge request !13944 | |||||
| * | | | | | | | | | | | | | Optimize policy rule | Michael Kozono | 2017-09-07 | 1 | -2/+3 | |
| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Refer to “Share with group lock” consistentlyimprove-share-locking-feature-for-subgroups | Michael Kozono | 2017-09-06 | 10 | -70/+70 | |
| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Update “Share with group lock” docs | Michael Kozono | 2017-09-06 | 3 | -17/+24 | |
| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Make UpdateService error message translatable | Winnie Hellmann | 2017-09-06 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Replace <h5> with <label> | Winnie Hellmann | 2017-09-06 | 2 | -3/+1 | |
| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Add missing .html_safes | Winnie Hellmann | 2017-09-06 | 1 | -3/+3 | |
| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Remove top margin from .control-label | Winnie Hellmann | 2017-09-06 | 1 | -0/+2 | |
| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Link or not link depending on permissions | Michael Kozono | 2017-09-06 | 2 | -11/+29 | |
| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Fix ability when Share lock is off | Michael Kozono | 2017-09-06 | 2 | -45/+62 | |
| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Link to ancestor settings page | Michael Kozono | 2017-09-06 | 2 | -4/+10 | |
| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Refactor based on code review | Michael Kozono | 2017-09-06 | 6 | -9/+9 | |
| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Fix “Share lock” help text | Michael Kozono | 2017-09-06 | 4 | -44/+116 | |
| | | | | | | | | | | | | | |