summaryrefslogtreecommitdiff
path: root/app/assets/javascripts
Commit message (Collapse)AuthorAgeFilesLines
* MRWidget: Change order of if blocks to determine widget state properly.acet-fix-mr-widget-stateFatih Acet2017-05-241-4/+4
|
* 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 nothing Closes #32738 See merge request !11623
| * Fix group/project name ellipsis button doing nothing32738-fix-project-title-ellipsis-doing-nothingEric Eastwood2017-05-221-3/+3
| | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32738
* | Merge branch 'winh-frontend-user-cache' into 'master'Filipa Lacerda2017-05-233-14/+51
|\ \ | | | | | | | | | | | | Introduce UsersCache for storing user entities in frontend See merge request !11404
| * | 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' ↵Fatih Acet2017-05-231-3/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Follow-up from "Add "SHA mismatch" state to the MR widget"" Closes #32480 See merge request !11466
| * | | 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
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent project transfer if a new group is not selected Closes #25455 See merge request !11214
| * | | | 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 '32657-fix-mr-widget-styles' into 'master'Fatih Acet2017-05-221-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MR widget styling fixes Closes #32657 See merge request !11591
| * | | | MR widget styling fixes32657-fix-mr-widget-styleskushalpandya2017-05-221-1/+1
| | |_|/ | |/| |
* | | | Merge branch 'fix-weird-jquery-data-attribute-caching-issue-in-notes' into ↵Phil Hughes2017-05-221-2/+3
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix jQuery data attribute caching issue causing expanding issues Closes #32705 See merge request !11609
| * | | Fix jQuery data attribute caching issue casuing expanding issuesEric Eastwood2017-05-221-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Command | Result $link.data('lineType') | '' $link.data('line-type') | '' $link.attr('data-line-type') | 'new' $link[0].dataset.lineType | 'new'
* | | | Merge branch 'update-coding-translation' into 'master'Douwe Maan2017-05-221-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Change translation for 'coding' by 'desarrollo' for spanish See merge request !11580
| * | | | 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
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Adopt ES module syntax See merge request !9567
| * | | 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
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Load improvements related to MR widget See merge request !11518
| * | | | 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 Closes #31897 See merge request !11171
| * | | | | 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-192-2/+2
| | | | | |
* | | | | | Merge branch '32551-fix-system-note-comparison-and-standardize-note-setup' ↵Filipa Lacerda2017-05-191-11/+11
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Fix system note comparison and standardize note setup Closes #32551 See merge request !11532
| * | | | | Fix system note comparison and standardize note setupEric Eastwood2017-05-191-11/+11
| | |/ / / | |/| | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32551
* | | | | Merge branch 'mr-widget-refresh-failed' into 'master'Filipa Lacerda2017-05-191-1/+27
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add refresh button into MR widget failed state. Closes #32543 See merge request !11519
| * | | | | MRWidget: Make error message bold and red.mr-widget-refresh-failedFatih Acet2017-05-191-1/+1
| | | | | |
| * | | | | MRWidget: Change refresh button place in failed state.Fatih Acet2017-05-191-3/+3
| | | | | |
| * | | | | MRWidget: Add refresh button into MR widget failed state.Fatih Acet2017-05-191-0/+26
| | | | | |
* | | | | | Merge branch 'dm-fix-readme-project-view' into 'master'Dmitriy Zaporozhets2017-05-191-0/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove readme project_view option See merge request !11425
| * | | | | | Remove readme project_view optionDouwe Maan2017-05-191-0/+2
| | | | | | |
* | | | | | | Merge branch 'user-avatar-vue-ce' into 'master'Phil Hughes2017-05-1914-66/+301
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Consolidate user avatar Vue logic Closes #31017 See merge request !10718
| * | | | | | Fixes per feedback on user avatar components.Bryce Johnson2017-05-183-23/+14
| | | | | | |
| * | | | | | Consolidate user avatar Vue logicBryce Johnson2017-05-1815-66/+310
| | |/ / / / | |/| | | |
* | | | | | Fix JavaScript translations that are using a namespacefix-js-translationsRuben Davila2017-05-186-11/+11
| |/ / / / |/| | | |
* | | | | Merge branch 'delete-old-mr-widget' into 'master'Fatih Acet2017-05-181-303/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Delete merge_request_widget.js See merge request !11452
| * | | | | Delete merge_request_widget.jsdelete-old-mr-widgetLuke "Jared" Bennett2017-05-171-303/+0
| | |_|_|/ | |/| | |
* | | | | Fix clicking disabled clipboard button toolipLuke "Jared" Bennett2017-05-181-2/+2
| |/ / / |/| | |