Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | Merge branch 'remove-bootlint' into 'master' | Clement Ho | 2017-09-08 | 2 | -6/+0 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove bootlint which takes 1 second of render time on development Closes #37657 See merge request !14167 | |||||
| * | | | | | | | Remove bootlint which takes 1 second of render time on development | Jacob Schatz | 2017-09-08 | 2 | -6/+0 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge branch 'sidebar-drop-shadow' into 'master' | Annabel Dunstone Gray | 2017-09-08 | 2 | -0/+12 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds drop shadow to the expanded sidebar Closes #36750 and #13983 See merge request !13994 | |||||
| * | | | | | | Adds drop shadow to the expanded sidebar | Phil Hughes | 2017-09-08 | 2 | -0/+12 | |
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Shadow is added in sm & md breakpoints. Clicking the anything outside of the sidebar also hides collapses the sidebar at these breakpoints. Closes #13983 | |||||
* | | | | | | Merge branch 'revert-f2421b2b' into 'master' | Robert Speicher | 2017-09-08 | 33 | -648/+111 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Add option to change navigation color palette" See merge request !14148 | |||||
| * | | | | | | Revert "Merge branch ↵revert-f2421b2b | Rubén Dávila | 2017-09-08 | 33 | -648/+111 | |
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | '35012-navigation-add-option-to-change-navigation-color-palette' into 'master'" This reverts merge request !13619 | |||||
* | | | | | | Merge branch 'fix/ldap-typo-docs' into 'master' | Achilleas Pipinellis | 2017-09-08 | 1 | -1/+1 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [CE] Fix small typos in LDAP documentation See merge request !14153 | |||||
| * | | | | | | Update ldap.mdfix/ldap-typo-docs | James Lopez | 2017-09-08 | 1 | -1/+1 | |
| | | | | | | | ||||||
* | | | | | | | Merge branch 'docs-quick-fix' into 'master' | Achilleas Pipinellis | 2017-09-08 | 3 | -6/+11 | |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | Docs: quick fix - indexes project settings See merge request !14158 | |||||
| * | | | | | | index project settings doc from other indexes | Marcia Ramos | 2017-09-08 | 2 | -0/+5 | |
| | | | | | | | ||||||
| * | | | | | | copyedit | Marcia Ramos | 2017-09-08 | 1 | -5/+5 | |
| | | | | | | | ||||||
| * | | | | | | fixes link | Marcia Ramos | 2017-09-08 | 1 | -1/+1 | |
|/ / / / / / | ||||||
* | | | | | | Merge branch 'fix/gb/qa/new-navigation-support' into 'master' | Rémy Coutable | 2017-09-08 | 1 | -10/+11 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | Fix GitLab QA for new navigation enabled by default See merge request !14134 | |||||
| * | | | | | Fix GitLab QA for new navigation enabled by defaultfix/gb/qa/new-navigation-support | Grzegorz Bizon | 2017-09-08 | 1 | -10/+11 | |
| | | | | | | ||||||
* | | | | | | Merge branch 'jk-update-dependencies' into 'master' | Achilleas Pipinellis | 2017-09-08 | 1 | -293/+326 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update dependencies license list for 10.0 See merge request !14137 | |||||
| * | | | | | | Update dependencies license list for 10.0jk-update-dependencies | Jarka Kadlecova | 2017-09-08 | 1 | -293/+326 | |
| |/ / / / / | ||||||
* | | | | | | Merge branch 'jk-update-templates' into 'master' | Achilleas Pipinellis | 2017-09-08 | 4 | -4/+55 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | Update license templates for 10.0 See merge request !14136 | |||||
| * | | | | | Update license templates for 10.0jk-update-templates | Jarka Kadlecova | 2017-09-08 | 4 | -4/+55 | |
| |/ / / / | ||||||
* | | | | | 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 | |
| | | | | | | | | | |