summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '32735-fix-right-sidebar-coming-up-short' into 'master'Annabel Dunstone Gray2017-05-231-0/+4
|\
| * Fix sidebar coming up short on mobile32735-fix-right-sidebar-coming-up-shortEric Eastwood2017-05-231-0/+4
* | Merge branch 'winh-filters-dropdown-scroll' into 'master'Annabel Dunstone Gray2017-05-231-5/+2
|\ \
| * | Make static filter entries scroll with dynamic oneswinh-filters-dropdown-scrollwinh2017-05-231-5/+2
* | | Merge branch '32738-fix-project-title-ellipsis-doing-nothing' into 'master'Annabel Dunstone Gray2017-05-231-3/+3
|\ \ \
| * | | Fix group/project name ellipsis button doing nothing32738-fix-project-title-ellipsis-doing-nothingEric Eastwood2017-05-221-3/+3
| | |/ | |/|
* | | Merge branch 'winh-frontend-user-cache' into 'master'Filipa Lacerda2017-05-233-14/+51
|\ \ \
| * | | Add frontend UsersCache class (!11404)winh-frontend-user-cachewinh2017-05-231-0/+28
| * | | Extract Cache class from AjaxCachewinh2017-05-212-14/+23
| | |/ | |/|
* | | Merge branch '32480-follow-up-from-add-sha-mismatch-state-to-the-mr-widget' i...Fatih Acet2017-05-231-3/+2
|\ \ \
| * | | ensure MergeRequestStore sha value never changes after instantiation32480-follow-up-from-add-sha-mismatch-state-to-the-mr-widgetMike Greiling2017-05-171-3/+2
* | | | Merge branch 'prevent-project-transfer' into 'master'Douwe Maan2017-05-232-0/+13
|\ \ \ \
| * | | | Renamed some messages and refactored the project_edit class to a functionJose Ivan Vargas2017-05-222-16/+9
| * | | | Prevent project transfer if a new group is not selectedJose Ivan Vargas2017-05-222-0/+20
* | | | | Merge branch '32418-make-link-to-self-less-obvious' into 'master'Fatih Acet2017-05-221-5/+1
|\ \ \ \ \
| * | | | | Change links to issuable meta to blackAnnabel Dunstone Gray2017-05-191-5/+1
* | | | | | Merge branch '32486-fix-note-emoji-placement' into 'master'Annabel Dunstone Gray2017-05-221-4/+0
|\ \ \ \ \ \
| * | | | | | 32486 Fix placement of note emoji on hover32486-fix-note-emoji-placementtauriedavis2017-05-221-4/+0
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch '32657-fix-mr-widget-styles' into 'master'Fatih Acet2017-05-222-7/+15
|\ \ \ \ \ \
| * | | | | | MR widget styling fixes32657-fix-mr-widget-styleskushalpandya2017-05-222-7/+15
| |/ / / / /
* | | | | | Merge branch '32631-issue-emoji-wrap' into 'master'Clement Ho2017-05-222-1/+5
|\ \ \ \ \ \
| * | | | | | Fix spacing of issue emojis32631-issue-emoji-wrapAnnabel Dunstone Gray2017-05-192-1/+5
* | | | | | | Merge branch 'fix-weird-jquery-data-attribute-caching-issue-in-notes' into 'm...Phil Hughes2017-05-221-2/+3
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Fix jQuery data attribute caching issue casuing expanding issuesEric Eastwood2017-05-221-2/+3
* | | | | | | Merge branch '32570-project-activity-tab-border' into 'master'Annabel Dunstone Gray2017-05-221-2/+2
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | 32570 Fix border-bottom for project activity tab32570-project-activity-tab-bordertauriedavis2017-05-191-2/+2
* | | | | | | Merge branch 'update-coding-translation' into 'master'Douwe Maan2017-05-221-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Change translation for 'coding' by 'desarrollo' for Spanishupdate-coding-translationRuben Davila2017-05-201-1/+1
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'adopt-es-module-syntax' into 'master'Filipa Lacerda2017-05-2246-165/+143
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | fix eslint violationadopt-es-module-syntaxMike Greiling2017-05-181-1/+1
| * | | | | | refactor instances of CJS module.exports to ES module syntaxMike Greiling2017-05-165-11/+4
| * | | | | | fix eslint failuresMike Greiling2017-05-161-2/+1
| * | | | | | update dispatcher.js to use ES module syntaxMike Greiling2017-05-161-3/+1
| * | | | | | update remaining uses of CJS syntax to ES module syntaxMike Greiling2017-05-1620-59/+64
| * | | | | | update shortcuts scripts to use ES module syntaxMike Greiling2017-05-165-7/+7
| * | | | | | update filtered_search to ES module syntaxMike Greiling2017-05-165-17/+14
| * | | | | | update diff_notes_bundle to ES module syntaxMike Greiling2017-05-162-18/+13
| * | | | | | update cycle_analytics_bundle to ES module syntaxMike Greiling2017-05-162-15/+14
| * | | | | | update boards_bundle to ES module syntaxMike Greiling2017-05-167-33/+25
* | | | | | | Add users endpoint to frontend API classWinnie Hellmann2017-05-1912-114/+138
* | | | | | | Merge branch '32536-mr-widget-performance-improvements' into 'master'Fatih Acet2017-05-192-2/+1
|\ \ \ \ \ \ \
| * | | | | | | Remove unnecessary initial requestOswaldo Ferreira2017-05-181-1/+0
| * | | | | | | Drop merge_check endpoint and use only MR show insteadOswaldo Ferreira2017-05-181-1/+1
* | | | | | | | Merge branch 'winh-dropdown-ajax-cache' into 'master'Clement Ho2017-05-191-28/+6
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Use AjaxCache in Droplab Ajax plugin (!11171)winh-dropdown-ajax-cachewinh2017-05-181-28/+6
* | | | | | | | Refine MR widget styling for buttons and info textKushal Pandya2017-05-193-2/+18
| |_|_|_|/ / / |/| | | | | |
* | | | | | | Merge branch '32551-fix-system-note-comparison-and-standardize-note-setup' in...Filipa Lacerda2017-05-191-11/+11
|\ \ \ \ \ \ \
| * | | | | | | Fix system note comparison and standardize note setupEric Eastwood2017-05-191-11/+11
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch '32556-side-by-side-mr-discussion-should-stretch-to-max-width' i...Annabel Dunstone Gray2017-05-191-1/+0
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Remove width limit from discussion notes32556-side-by-side-mr-discussion-should-stretch-to-max-widthClement Ho2017-05-191-1/+0
| | |_|_|/ / | |/| | | |