summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Collapse)AuthorAgeFilesLines
* Update issuable status icons33926-update-issuable-iconsEric Eastwood2017-12-133-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 Gray2017-12-1227-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-dropdownsWinnie Hellmann2017-12-081-2/+0
| |
| * Fix top margin for right aligned dropdownsWinnie Hellmann2017-12-081-1/+0
| |
| * Remove border radius from pipelines dropdownsWinnie Hellmann2017-12-081-1/+0
| |
| * Fix dropdown top marginWinnie Hellmann2017-12-081-1/+1
| |
| * Fix padding for search dropdownWinnie Hellmann2017-12-081-5/+0
| |
| * Remove new-style-dropdown mixinWinnie Hellmann2017-12-0826-85/+0
| |
| * Use global styles for filter dropdownsWinnie Hellmann2017-12-082-54/+10
| |
| * Make new .dropdown-menu-align-right style globalWinnie Hellmann2017-12-081-4/+2
| |
| * Make new .dropdown-menu style globalWinnie Hellmann2017-12-081-15/+1
| |
| * Make new .dropdown-menu-selectable style globalWinnie Hellmann2017-12-081-39/+28
| |
| * Make new dropdown <li> style globalWinnie Hellmann2017-12-081-17/+2
| |
| * Make new dropdown-link style globalWinnie Hellmann2017-12-081-21/+10
| |
| * Make new .dropdown-menu-user-link style globalWinnie Hellmann2017-12-081-13/+7
| |
| * Make new dropdown-item-hover style globalWinnie Hellmann2017-12-081-39/+23
| |
| * Make new .text-danger style globalWinnie Hellmann2017-12-081-10/+5
| |
| * Make new .is-active style globalWinnie Hellmann2017-12-081-18/+7
| |
| * Make new .dropdown-header style globalWinnie Hellmann2017-12-081-6/+2
| |
| * Make new style .divider globalWinnie Hellmann2017-12-081-15/+5
| |
| * Make new .dropdown-open-top style globalWinnie Hellmann2017-12-081-4/+4
| |
* | Merge branch 'add-js-prefix-issuable-edit' into 'master'Filipa Lacerda2017-12-122-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-editClement Ho2017-12-082-2/+2
| | |
* | | Merge branch '37619-fix-vue-typeerror-not-failing-the-build' into 'master'Filipa Lacerda2017-12-121-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 overEric Eastwood2017-12-101-3/+1
| | |/ | |/| | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/issues/37619#note_50422859
* | | Merge branch '40997-pipeline-null' into 'master'Phil Hughes2017-12-121-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-nullFilipa Lacerda2017-12-111-11/+30
| | | |
* | | | Merge branch '39608-comment-on-image-discussions-tab-alignment' into 'master'Tim Zallmann2017-12-1210-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-alignmentEric Eastwood2017-12-0810-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 Acet2017-12-117-27/+27
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | rename remaining issue_ prefixed files See merge request gitlab-org/gitlab-ce!15818
| * | | | rename remaining issue_ prefixed filesissue-note-renameSimon Knox2017-12-097-27/+27
| | |_|/ | |/| |
* | | | Merge branch 'backport-epic-in-issue' into 'master'Jacob Schatz2017-12-119-58/+121
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | Backport epic in issue See merge request gitlab-org/gitlab-ce!15799
| * | | Backport epic in issueepic-in-issuebackport-epic-in-issueClement Ho2017-12-079-58/+121
| | | |
* | | | Merge branch 'url-utility-es-module' into 'master'Filipa Lacerda2017-12-1131-125/+120
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Moved URL utility methods into exported es modules See merge request gitlab-org/gitlab-ce!15783
| * | | | updated importsurl-utility-es-modulePhil Hughes2017-12-1114-29/+29
| | | | |
| * | | | Merge branch 'master' into 'url-utility-es-module'Phil Hughes2017-12-1119-168/+435
| |\ \ \ \ | | | | | | | | | | | | | | | | | | # Conflicts: # app/assets/javascripts/issue_show/components/app.vue
| * | | | | fixed URL being undefined :face_palm:Phil Hughes2017-12-081-2/+2
| | | | | |
| * | | | | use exported methods instead of gl.utilsPhil Hughes2017-12-0831-68/+74
| | | | | |
| * | | | | Moved URL utility methods into es modulesPhil Hughes2017-12-081-69/+58
| | |_|_|/ | |/| | |
* | | | | Merge branch '35724-animate-sidebar' into 'master'Filipa Lacerda2017-12-116-27/+32
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Animate contextual sidebar; change class names for easier readability Closes #35724 See merge request gitlab-org/gitlab-ce!15797
| * | | | | Fix transitions35724-animate-sidebarAnnabel Dunstone Gray2017-12-071-12/+9
| | | | | |
| * | | | | Fix mobile stylesAnnabel Dunstone Gray2017-12-071-10/+3
| | | | | |
| * | | | | Animate contextual sidebar; change class names for easier readabilityAnnabel Dunstone Gray2017-12-076-22/+37
| | | | | |
* | | | | | Merge branch 'mk-pick-10-2-4-security-fixes' into 'master'Winnie Hellmann2017-12-111-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 Acet2017-12-081-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 modeClement Ho2017-12-111-2/+2
| | | | | |
* | | | | | Merge branch 'es-module-compare' into 'master'Filipa Lacerda2017-12-114-86/+73
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | Convert Compare and CompareAutocomplete classes into ES module syntax See merge request gitlab-org/gitlab-ce!14857
| * | | | | revert arrow function changees-module-compareMike Greiling2017-11-301-1/+1
| | | | | |
| * | | | | convert CompareAutocomplete from class definition into simple function call, ↵Mike Greiling2017-11-303-65/+56
| | | | | | | | | | | | | | | | | | | | | | | | remove global export
| * | | | | convert Compare class into ES module import/export syntaxMike Greiling2017-11-303-4/+3
| | | | | |