summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Expand)AuthorAgeFilesLines
* Revert "Merge branch '22680-unlabel-limit-autocomplete-to-selected-items' int...revert-0a3cafb2Douwe Maan2016-11-171-6/+0
* Merge branch 'related-mr-labels' into 'master' Annabel Dunstone Gray2016-11-161-3/+22
|\
| * Fix SCSS linter errors.Didem Acet2016-11-161-8/+9
| * Added colored labels to related MR list.Didem Acet2016-11-161-3/+21
* | Merge branch 'explicitly-disable-eslint-inline' into 'master' Alfredo Sumaran2016-11-16120-119/+121
|\ \
| * | explicitly disable eslint inlineexplicitly-disable-eslint-inlineLuke "Jared" Bennett2016-11-15120-119/+121
* | | Merge branch 'user-dropdown-multiple-requests-fix' into 'master' Fatih Acet2016-11-161-1/+1
|\ \ \ | |_|/ |/| |
| * | Stopped multiple requests with dropdownsuser-dropdown-multiple-requests-fixPhil Hughes2016-11-161-1/+1
* | | Merge branch '23117-search-for-a-filename-in-a-project' into 'master' Sean McGivern2016-11-161-0/+4
|\ \ \ | |/ / |/| |
| * | Search for a filename in a project23117-search-for-a-filename-in-a-projectValery Sizov2016-11-161-0/+4
| |/
* | Merge branch '22680-unlabel-limit-autocomplete-to-selected-items' into 'master' Rémy Coutable2016-11-161-0/+6
|\ \
| * | Limit autocomplete to currently selected itemsAkram FARES2016-11-151-0/+6
* | | Merge branch '22790-mention-autocomplete-avatar' into 'master' Alfredo Sumaran2016-11-153-6/+31
|\ \ \ | |/ / |/| |
| * | shows user avatar in mention autocomplete in editor22790-mention-autocomplete-avatarNur Rony2016-11-163-6/+31
* | | Merge branch '24492-promise-polyfill' into 'master' Jacob Schatz2016-11-151-0/+1
|\ \ \ | |/ / |/| |
| * | Adds es6-promise polyfill24492-promise-polyfillFilipa Lacerda2016-11-151-0/+1
| |/
* | Merge branch 'darken-badge-hover' into 'master' Annabel Dunstone Gray2016-11-152-4/+6
|\ \ | |/ |/|
| * Darken todo badge on hoverdarken-badge-hovertauriedavis2016-11-142-4/+6
* | Merge branch '21076-deleted-merged-branches' into 'master' Douwe Maan2016-11-151-0/+4
|\ \
| * | Add button to delete all merged branchesToon Claes2016-11-091-0/+4
* | | Merge branch '21778-pinned-nav-header' into 'master' Annabel Dunstone Gray2016-11-143-2/+26
|\ \ \
| * | | 21778 Correct css styles for pinned navigation21778-pinned-nav-headertauriedavis2016-11-113-2/+26
* | | | Merge branch 'fix-search-input-padding' into 'master' Annabel Dunstone Gray2016-11-141-2/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Use shorthand property for padding fixPhilip Karpiak2016-11-141-2/+1
| * | | Give search-input correct padding-right valuePhilip Karpiak2016-11-101-1/+1
* | | | Merge branch '22307-pipeline-link-in-builds-view' into 'master' Kamil Trzciński2016-11-132-6/+2
|\ \ \ \
| * | | | update generic commit status to correspond with build status templateMike Greiling2016-11-101-2/+2
| * | | | remove red color on API pipeline trigger designationMike Greiling2016-11-101-4/+0
* | | | | Merge branch '24202-header-ui-improvements' into 'master' Fatih Acet2016-11-122-0/+12
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Remove hover state on location badge.Devesh Khandelwal2016-11-121-6/+0
| * | | | Darken more icons on hover and highlight search form also.Devesh Khandelwal2016-11-112-0/+14
| * | | | Darken project selection dropdown caret on hover.Devesh Khandelwal2016-11-111-0/+4
| |/ / /
* | | | Merge branch 'vue2' into 'master' Fatih Acet2016-11-1124-164/+202
|\ \ \ \
| * | | | Fixed tests for issue boards & diff note resolvingvue2Phil Hughes2016-11-101-0/+2
| * | | | Fix Merge Conflicts app to make it work with Vue 2Alfredo Sumaran2016-11-101-1/+16
| * | | | Changed how lists get sortedPhil Hughes2016-11-103-2/+6
| * | | | Issue board spec fixesPhil Hughes2016-11-102-1/+3
| * | | | Fixed jump to discussion button not showingPhil Hughes2016-11-101-1/+5
| * | | | Changed how resolving notes is renderedPhil Hughes2016-11-104-35/+39
| * | | | Remove unnecesarry require.Fatih Acet2016-11-101-1/+0
| * | | | Fixed up resolve discussionsPhil Hughes2016-11-106-17/+32
| * | | | Refactor of issue boards to work with Vue2Phil Hughes2016-11-109-82/+91
| * | | | VueJSMigration: Remove parallel-conflict-line component.Fatih Acet2016-11-102-19/+1
| * | | | Vue migration fix syntax highlighting.Fatih Acet2016-11-101-1/+1
| * | | | Migrate Vue v1 to v2.Fatih Acet2016-11-109-21/+23
| | |/ / | |/| |
* | | | Merge branch '19205-group-header-redesign' into 'master' Annabel Dunstone Gray2016-11-113-34/+23
|\ \ \ \
| * | | | 19205 Redesign group page header to match new navigation19205-group-header-redesigntauriedavis2016-11-093-34/+23
* | | | | Merge branch '23520-mr-sticky-tabs-overlap-discussion-from-anchor' into 'mast...Fatih Acet2016-11-112-2/+19
|\ \ \ \ \
| * | | | | Account for merge request fixed affix bar23520-mr-sticky-tabs-overlap-discussion-from-anchorLuke Bennett2016-11-102-2/+19
| | |/ / / | |/| | |
* | | | | Merge branch '24369-remove-additional-padding' into 'master' Annabel Dunstone Gray2016-11-101-0/+1
|\ \ \ \ \