summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Collapse)AuthorAgeFilesLines
* Remove IIFEs in filtered_search_bundle.jsremove-iife-filtered-search-bundleAlfredo Sumaran2017-04-179-1078/+1060
|
* Merge branch '27655-clear-emoji-search-after-selection' into 'master' Alfredo Sumaran2017-04-171-17/+36
|\ | | | | | | | | | | | | Clear emoji search in awards menu after picking emoji Closes #27655 See merge request !10524
| * Clear emoji search in awards menu after picking emoji27655-clear-emoji-search-after-selectionEric Eastwood2017-04-131-17/+36
| | | | | | | | Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/27655
* | Merge branch ↵Phil Hughes2017-04-151-4/+4
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | '30492-using-icon-to-mark-discussion-as-resolved-does-not-resolve-discussion' into 'master' Resolve "Using icon to mark discussion as resolved does not resolve discussion" Closes #30492 See merge request !10652
| * | Update ResolveBtn when CommentStore changes state30492-using-icon-to-mark-discussion-as-resolved-does-not-resolve-discussionSam Rose2017-04-131-4/+4
| | |
* | | Issue Title Vue: convert to .vue - use 'render' with 'createElement' in indexRegis Boudinot2017-04-152-24/+21
| | |
* | | Merge branch '30810-fix-note-header-info-and-action-overlap' into 'master' Annabel Dunstone Gray2017-04-141-5/+20
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix note header timeago and action overlap Closes #30810 See merge request !10644
| * | | Fix note header timeago and action overlap30810-fix-note-header-info-and-action-overlapEric Eastwood2017-04-131-5/+20
| | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/30810
* | | | Merge branch 'remove-double-newline-for-single-attachments' into 'master' Phil Hughes2017-04-141-3/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only add newlines for multiple uploads Closes #29782 See merge request !10545
| * | | | Only add newlines for multiple uploadsremove-double-newline-for-single-attachmentsLuke "Jared" Bennett2017-04-141-3/+7
| | | | |
* | | | | Merge branch 'add-cookie-expirations-to-callouts' into 'master' Phil Hughes2017-04-142-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add expirations to CA and user callouts Closes #30267 See merge request !10568
| * | | | | Add expirations to CA and user calloutsLuke "Jared" Bennett2017-04-142-2/+2
| |/ / / /
* | | | | frontend prevent authored votesbarthc2017-04-143-9/+59
|/ / / /
* | | | Merge branch 'pms-lighter-colors' into 'master' Annabel Dunstone Gray2017-04-131-13/+17
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add lighter colors and fix existing light colors See merge request !10690
| * | | | Add lighter color variables. Fix active note color.pms-lighter-colorsPedro Moreira da Silva2017-04-131-13/+17
| | | | |
* | | | | Merge branch 'empty-task-list-alignment' into 'master' jej/master-greenjej-master-greenAnnabel Dunstone Gray2017-04-131-0/+1
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Fixed alignment of empty task list items Closes #29913 See merge request !10480
| * | | | Fixed alignment of empty task list itemsempty-task-list-alignmentPhil Hughes2017-04-111-0/+1
| | | | | | | | | | | | | | | | | | | | Closes #29913
* | | | | Merge branch '30622-resolve-note-loading-icon-gone' into 'master' Filipa Lacerda2017-04-131-1/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Resolve note loading icon gone" Closes #30622 See merge request !10628
| * | | | | Review changes30622-resolve-note-loading-icon-goneLuke "Jared" Bennett2017-04-121-0/+5
| | | | | |
| * | | | | Fix resolve spinner and add testLuke "Jared" Bennett2017-04-111-1/+0
| |/ / / /
* | | | | Merge branch '30188-handle-remove-branch-failure' into 'master' Filipa Lacerda2017-04-131-5/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix js error in MR remove branch failure handler Closes #30188 See merge request !10304
| * | | | | tests for success and failure of deleting branch from MR page30188-handle-remove-branch-failureSimon Knox2017-04-131-1/+3
| | | | | |
| * | | | | fix js error in MR remove branch failure handlerSimon Knox2017-04-121-4/+4
| | |/ / / | |/| | |
* | | | | Merge branch 'remove-iife-cycle-analytics-bundle' into 'master' 26510-should-project-updated-time-actually-be-the-last-activity-timeFilipa Lacerda2017-04-1311-622/+609
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove IIFEs from files in cycle_analytics_bundle.js See merge request !10613
| * | | | | Remove IIFEs from files in cycle_analytics_bundle.jsremove-iife-cycle-analytics-bundleAlfredo Sumaran2017-04-1011-622/+609
| | | | | |
* | | | | | Merge branch 'remove-iife-boards-bundle' into 'master' Filipa Lacerda2017-04-1318-1269/+1232
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | Remove IIFEs in boards_bundle.js See merge request !10612
| * | | | | Remove IIFEs in boards_bundle.jsremove-iife-boards-bundleAlfredo Sumaran2017-04-1018-1269/+1232
| |/ / / /
* | | | | Merge branch '30642-fix-recent-search-history-icon-alignment-in-safari' into ↵Clement Ho2017-04-131-14/+12
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix recent searches icon alignment in Safari Closes #30642 See merge request !10606
| * | | | Fix recent searches icon alignment in Safari30642-fix-recent-search-history-icon-alignment-in-safariEric Eastwood2017-04-121-14/+12
| | |_|/ | |/| | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/30642
* | | | Merge branch 'use-avatars-in-activity-view' into 'master' Douwe Maan2017-04-121-8/+14
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Use avatars instead of icons in activity view See merge request !10596
| * | | | Reuse system notes helper for profile event iconsAnnabel Dunstone Gray2017-04-111-3/+6
| | | | |
| * | | | Use avatars instead of icons in activity viewAnnabel Dunstone Gray2017-04-101-5/+8
| | | | |
* | | | | Merge branch '22714-update-all-instances-of-fa-refresh' into 'master' Alfredo Sumaran2017-04-122-4/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update all instances of "fa-refresh" to "fa-spinner" Closes #22714 See merge request !10490
| * | | | | Update all instances of "fa-refresh" to "fa-spinner"Andrew Torres2017-04-112-4/+4
| | |_|_|/ | |/| | |
* | | | | Merge branch '30858-system-notes-indent' into 'master' Jacob Schatz2017-04-121-4/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Indent system notes on desktop screens Closes #30858 See merge request !10667
| * | | | | Indent system notes on desktop screensAnnabel Dunstone Gray2017-04-121-4/+12
| | | | | |
* | | | | | Reset New branch button when issue state changes💃 Winnie 💃2017-04-121-51/+57
|/ / / / /
* | | | | Fix filtered search input width for IEClement Ho2017-04-121-1/+1
| | | | |
* | | | | Let browser set overflow-x scroll on user activity calendar.user-activity-scroll-barBryce Johnson2017-04-111-1/+1
|/ / / /
* | | | Merge branch 'dm-outdated-diff-link' into 'master' Sean McGivern2017-04-111-0/+2
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | Link to outdated diff in older MR version from outdated diff discussion Closes #27865 See merge request !10572
| * | | Link to outdated diff in older MR version from outdated diff discussionDouwe Maan2017-04-081-0/+2
| | | |
* | | | Merge branch 'boards-done-add-tooltip' into 'master' Filipa Lacerda2017-04-111-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue 22424: Add tooltip to header of Done list Closes #22424 See merge request !10574
| * | | | Issue 22424: Add tooltip to header of Done listandrew brown2017-04-091-0/+1
| | | | |
* | | | | Merge branch 'double-border' into 'master' Filipa Lacerda2017-04-111-1/+0
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | Remove double border on MR tab See merge request !10593
| * | | | Remove double border on MR tabdouble-borderAnnabel Dunstone Gray2017-04-101-1/+0
| | |_|/ | |/| |
* | | | Merge branch 'add-vue-loader' into 'master' Filipa Lacerda2017-04-108-80/+86
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Add vue loader Closes #29519 See merge request !10517
| * | | fix closing tags of async_button componentMike Greiling2017-04-091-4/+5
| | | |
| * | | convert pipeline async_button component to vue templateMike Greiling2017-04-092-24/+26
| | | |
| * | | convert pipeline error state to vue templateMike Greiling2017-04-094-21/+23
| | | |
| * | | convert pipeline empty state to vue templateMike Greiling2017-04-094-35/+36
| | | |