Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update issuable status icons33926-update-issuable-icons | Eric Eastwood | 2017-12-13 | 3 | -6/+18 |
| | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/33926 Changed file icons already addressed in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15367 | ||||
* | Merge branch 'winh-cleanup-dropdowns' into 'master' | Annabel Dunstone Gray | 2017-12-12 | 27 | -344/+101 |
|\ | | | | | | | | | | | | | Clean up new dropdown styles Closes #39142 and #39446 See merge request gitlab-org/gitlab-ce!13676 | ||||
| * | Make label delete option redwinh-cleanup-dropdowns | Winnie Hellmann | 2017-12-08 | 1 | -2/+0 |
| | | |||||
| * | Fix top margin for right aligned dropdowns | Winnie Hellmann | 2017-12-08 | 1 | -1/+0 |
| | | |||||
| * | Remove border radius from pipelines dropdowns | Winnie Hellmann | 2017-12-08 | 1 | -1/+0 |
| | | |||||
| * | Fix dropdown top margin | Winnie Hellmann | 2017-12-08 | 1 | -1/+1 |
| | | |||||
| * | Fix padding for search dropdown | Winnie Hellmann | 2017-12-08 | 1 | -5/+0 |
| | | |||||
| * | Remove new-style-dropdown mixin | Winnie Hellmann | 2017-12-08 | 26 | -85/+0 |
| | | |||||
| * | Use global styles for filter dropdowns | Winnie Hellmann | 2017-12-08 | 2 | -54/+10 |
| | | |||||
| * | Make new .dropdown-menu-align-right style global | Winnie Hellmann | 2017-12-08 | 1 | -4/+2 |
| | | |||||
| * | Make new .dropdown-menu style global | Winnie Hellmann | 2017-12-08 | 1 | -15/+1 |
| | | |||||
| * | Make new .dropdown-menu-selectable style global | Winnie Hellmann | 2017-12-08 | 1 | -39/+28 |
| | | |||||
| * | Make new dropdown <li> style global | Winnie Hellmann | 2017-12-08 | 1 | -17/+2 |
| | | |||||
| * | Make new dropdown-link style global | Winnie Hellmann | 2017-12-08 | 1 | -21/+10 |
| | | |||||
| * | Make new .dropdown-menu-user-link style global | Winnie Hellmann | 2017-12-08 | 1 | -13/+7 |
| | | |||||
| * | Make new dropdown-item-hover style global | Winnie Hellmann | 2017-12-08 | 1 | -39/+23 |
| | | |||||
| * | Make new .text-danger style global | Winnie Hellmann | 2017-12-08 | 1 | -10/+5 |
| | | |||||
| * | Make new .is-active style global | Winnie Hellmann | 2017-12-08 | 1 | -18/+7 |
| | | |||||
| * | Make new .dropdown-header style global | Winnie Hellmann | 2017-12-08 | 1 | -6/+2 |
| | | |||||
| * | Make new style .divider global | Winnie Hellmann | 2017-12-08 | 1 | -15/+5 |
| | | |||||
| * | Make new .dropdown-open-top style global | Winnie Hellmann | 2017-12-08 | 1 | -4/+4 |
| | | |||||
* | | Merge branch 'add-js-prefix-issuable-edit' into 'master' | Filipa Lacerda | 2017-12-12 | 2 | -2/+2 |
|\ \ | | | | | | | | | | | | | | | | | | | Add js prefix for issuable-edit Closes #40965 See merge request gitlab-org/gitlab-ce!15813 | ||||
| * | | Add js prefix for issuable-editadd-js-prefix-issuable-edit | Clement Ho | 2017-12-08 | 2 | -2/+2 |
| | | | |||||
* | | | Merge branch '37619-fix-vue-typeerror-not-failing-the-build' into 'master' | Filipa Lacerda | 2017-12-12 | 1 | -3/+1 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Stop "ERROR: TypeError{}" from being logged to the console and fail tests Closes #37619 See merge request gitlab-org/gitlab-ce!15830 | ||||
| * | | | Try to clean up legit Vue error that was patched over | Eric Eastwood | 2017-12-10 | 1 | -3/+1 |
| | |/ | |/| | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/issues/37619#note_50422859 | ||||
* | | | Merge branch '40997-pipeline-null' into 'master' | Phil Hughes | 2017-12-12 | 1 | -11/+30 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Checks for null in job tooltip title Closes #40997 See merge request gitlab-org/gitlab-ce!15869 | ||||
| * | | | Check for null in job tooltip title40997-pipeline-null | Filipa Lacerda | 2017-12-11 | 1 | -11/+30 |
| | | | | |||||
* | | | | Merge branch '39608-comment-on-image-discussions-tab-alignment' into 'master' | Tim Zallmann | 2017-12-12 | 10 | -19/+21 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix comment on image discussion icon alignment (update icons) Closes #39608 See merge request gitlab-org/gitlab-ce!15760 | ||||
| * | | | | Fix comment on image discussion icon alignment39608-comment-on-image-discussions-tab-alignment | Eric Eastwood | 2017-12-08 | 10 | -19/+21 |
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/39608 Use SVG icons to avoid having to position things See https://gitlab.com/gitlab-org/gitlab-ce/issues/39608#note_50088917 | ||||
* | | | | Merge branch 'issue-note-rename' into 'master' | Fatih Acet | 2017-12-11 | 7 | -27/+27 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | rename remaining issue_ prefixed files See merge request gitlab-org/gitlab-ce!15818 | ||||
| * | | | | rename remaining issue_ prefixed filesissue-note-rename | Simon Knox | 2017-12-09 | 7 | -27/+27 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'backport-epic-in-issue' into 'master' | Jacob Schatz | 2017-12-11 | 9 | -58/+121 |
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | Backport epic in issue See merge request gitlab-org/gitlab-ce!15799 | ||||
| * | | | Backport epic in issueepic-in-issuebackport-epic-in-issue | Clement Ho | 2017-12-07 | 9 | -58/+121 |
| | | | | |||||
* | | | | Merge branch 'url-utility-es-module' into 'master' | Filipa Lacerda | 2017-12-11 | 31 | -125/+120 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Moved URL utility methods into exported es modules See merge request gitlab-org/gitlab-ce!15783 | ||||
| * | | | | updated importsurl-utility-es-module | Phil Hughes | 2017-12-11 | 14 | -29/+29 |
| | | | | | |||||
| * | | | | Merge branch 'master' into 'url-utility-es-module' | Phil Hughes | 2017-12-11 | 19 | -168/+435 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | # Conflicts: # app/assets/javascripts/issue_show/components/app.vue | ||||
| * | | | | | fixed URL being undefined :face_palm: | Phil Hughes | 2017-12-08 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | use exported methods instead of gl.utils | Phil Hughes | 2017-12-08 | 31 | -68/+74 |
| | | | | | | |||||
| * | | | | | Moved URL utility methods into es modules | Phil Hughes | 2017-12-08 | 1 | -69/+58 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch '35724-animate-sidebar' into 'master' | Filipa Lacerda | 2017-12-11 | 6 | -27/+32 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Animate contextual sidebar; change class names for easier readability Closes #35724 See merge request gitlab-org/gitlab-ce!15797 | ||||
| * | | | | | Fix transitions35724-animate-sidebar | Annabel Dunstone Gray | 2017-12-07 | 1 | -12/+9 |
| | | | | | | |||||
| * | | | | | Fix mobile styles | Annabel Dunstone Gray | 2017-12-07 | 1 | -10/+3 |
| | | | | | | |||||
| * | | | | | Animate contextual sidebar; change class names for easier readability | Annabel Dunstone Gray | 2017-12-07 | 6 | -22/+37 |
| | | | | | | |||||
* | | | | | | Merge branch 'mk-pick-10-2-4-security-fixes' into 'master' | Winnie Hellmann | 2017-12-11 | 1 | -1/+2 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | Pick 10.2.4 security fixes into master See merge request gitlab-org/gitlab-ce!15821 | ||||
| * | | | | | Merge branch 'note-preview' into 'security-10-2' | Fatih Acet | 2017-12-08 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prevent potential XSS when editing comment See merge request gitlab/gitlabhq!2238 (cherry picked from commit 80ed6d25a46c0f70ec8baea78b5777118d63876c) 7480e462 prevent potential XSS when editing comment | ||||
* | | | | | | Fix image view mode | Clement Ho | 2017-12-11 | 1 | -2/+2 |
| | | | | | | |||||
* | | | | | | Merge branch 'es-module-compare' into 'master' | Filipa Lacerda | 2017-12-11 | 4 | -86/+73 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | Convert Compare and CompareAutocomplete classes into ES module syntax See merge request gitlab-org/gitlab-ce!14857 | ||||
| * | | | | | revert arrow function changees-module-compare | Mike Greiling | 2017-11-30 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | convert CompareAutocomplete from class definition into simple function call, ↵ | Mike Greiling | 2017-11-30 | 3 | -65/+56 |
| | | | | | | | | | | | | | | | | | | | | | | | | remove global export | ||||
| * | | | | | convert Compare class into ES module import/export syntax | Mike Greiling | 2017-11-30 | 3 | -4/+3 |
| | | | | | |