Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | MRWidget: Change order of if blocks to determine widget state properly.acet-fix-mr-widget-state | Fatih Acet | 2017-05-24 | 1 | -4/+4 |
| | |||||
* | Merge branch '32738-fix-project-title-ellipsis-doing-nothing' into 'master' | Annabel Dunstone Gray | 2017-05-23 | 1 | -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-nothing | Eric Eastwood | 2017-05-22 | 1 | -3/+3 |
| | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32738 | ||||
* | | Merge branch 'winh-frontend-user-cache' into 'master' | Filipa Lacerda | 2017-05-23 | 3 | -14/+51 |
|\ \ | | | | | | | | | | | | | Introduce UsersCache for storing user entities in frontend See merge request !11404 | ||||
| * | | Add frontend UsersCache class (!11404)winh-frontend-user-cache | winh | 2017-05-23 | 1 | -0/+28 |
| | | | |||||
| * | | Extract Cache class from AjaxCache | winh | 2017-05-21 | 2 | -14/+23 |
| | | | |||||
* | | | Merge branch '32480-follow-up-from-add-sha-mismatch-state-to-the-mr-widget' ↵ | Fatih Acet | 2017-05-23 | 1 | -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-widget | Mike Greiling | 2017-05-17 | 1 | -3/+2 |
| | | | | |||||
* | | | | Merge branch 'prevent-project-transfer' into 'master' | Douwe Maan | 2017-05-23 | 2 | -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 function | Jose Ivan Vargas | 2017-05-22 | 2 | -16/+9 |
| | | | | | |||||
| * | | | | Prevent project transfer if a new group is not selected | Jose Ivan Vargas | 2017-05-22 | 2 | -0/+20 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch '32657-fix-mr-widget-styles' into 'master' | Fatih Acet | 2017-05-22 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MR widget styling fixes Closes #32657 See merge request !11591 | ||||
| * | | | | MR widget styling fixes32657-fix-mr-widget-styles | kushalpandya | 2017-05-22 | 1 | -1/+1 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'fix-weird-jquery-data-attribute-caching-issue-in-notes' into ↵ | Phil Hughes | 2017-05-22 | 1 | -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 issues | Eric Eastwood | 2017-05-22 | 1 | -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 Maan | 2017-05-22 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Change translation for 'coding' by 'desarrollo' for spanish See merge request !11580 | ||||
| * | | | | Change translation for 'coding' by 'desarrollo' for Spanishupdate-coding-translation | Ruben Davila | 2017-05-20 | 1 | -1/+1 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'adopt-es-module-syntax' into 'master' | Filipa Lacerda | 2017-05-22 | 46 | -165/+143 |
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | Adopt ES module syntax See merge request !9567 | ||||
| * | | | fix eslint violationadopt-es-module-syntax | Mike Greiling | 2017-05-18 | 1 | -1/+1 |
| | | | | |||||
| * | | | refactor instances of CJS module.exports to ES module syntax | Mike Greiling | 2017-05-16 | 5 | -11/+4 |
| | | | | |||||
| * | | | fix eslint failures | Mike Greiling | 2017-05-16 | 1 | -2/+1 |
| | | | | |||||
| * | | | update dispatcher.js to use ES module syntax | Mike Greiling | 2017-05-16 | 1 | -3/+1 |
| | | | | |||||
| * | | | update remaining uses of CJS syntax to ES module syntax | Mike Greiling | 2017-05-16 | 20 | -59/+64 |
| | | | | |||||
| * | | | update shortcuts scripts to use ES module syntax | Mike Greiling | 2017-05-16 | 5 | -7/+7 |
| | | | | |||||
| * | | | update filtered_search to ES module syntax | Mike Greiling | 2017-05-16 | 5 | -17/+14 |
| | | | | |||||
| * | | | update diff_notes_bundle to ES module syntax | Mike Greiling | 2017-05-16 | 2 | -18/+13 |
| | | | | |||||
| * | | | update cycle_analytics_bundle to ES module syntax | Mike Greiling | 2017-05-16 | 2 | -15/+14 |
| | | | | |||||
| * | | | update boards_bundle to ES module syntax | Mike Greiling | 2017-05-16 | 7 | -33/+25 |
| | | | | |||||
* | | | | Add users endpoint to frontend API class | Winnie Hellmann | 2017-05-19 | 12 | -114/+138 |
| | | | | |||||
* | | | | Merge branch '32536-mr-widget-performance-improvements' into 'master' | Fatih Acet | 2017-05-19 | 2 | -2/+1 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Load improvements related to MR widget See merge request !11518 | ||||
| * | | | | Remove unnecessary initial request | Oswaldo Ferreira | 2017-05-18 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | Drop merge_check endpoint and use only MR show instead | Oswaldo Ferreira | 2017-05-18 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge branch 'winh-dropdown-ajax-cache' into 'master' | Clement Ho | 2017-05-19 | 1 | -28/+6 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use AjaxCache in Droplab Ajax plugin Closes #31897 See merge request !11171 | ||||
| * | | | | | Use AjaxCache in Droplab Ajax plugin (!11171)winh-dropdown-ajax-cache | winh | 2017-05-18 | 1 | -28/+6 |
| | | | | | | |||||
* | | | | | | Refine MR widget styling for buttons and info text | Kushal Pandya | 2017-05-19 | 2 | -2/+2 |
| | | | | | | |||||
* | | | | | | Merge branch '32551-fix-system-note-comparison-and-standardize-note-setup' ↵ | Filipa Lacerda | 2017-05-19 | 1 | -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 setup | Eric Eastwood | 2017-05-19 | 1 | -11/+11 |
| | |/ / / | |/| | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32551 | ||||
* | | | | | Merge branch 'mr-widget-refresh-failed' into 'master' | Filipa Lacerda | 2017-05-19 | 1 | -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-failed | Fatih Acet | 2017-05-19 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | MRWidget: Change refresh button place in failed state. | Fatih Acet | 2017-05-19 | 1 | -3/+3 |
| | | | | | | |||||
| * | | | | | MRWidget: Add refresh button into MR widget failed state. | Fatih Acet | 2017-05-19 | 1 | -0/+26 |
| | | | | | | |||||
* | | | | | | Merge branch 'dm-fix-readme-project-view' into 'master' | Dmitriy Zaporozhets | 2017-05-19 | 1 | -0/+2 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove readme project_view option See merge request !11425 | ||||
| * | | | | | | Remove readme project_view option | Douwe Maan | 2017-05-19 | 1 | -0/+2 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'user-avatar-vue-ce' into 'master' | Phil Hughes | 2017-05-19 | 14 | -66/+301 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Consolidate user avatar Vue logic Closes #31017 See merge request !10718 | ||||
| * | | | | | | Fixes per feedback on user avatar components. | Bryce Johnson | 2017-05-18 | 3 | -23/+14 |
| | | | | | | | |||||
| * | | | | | | Consolidate user avatar Vue logic | Bryce Johnson | 2017-05-18 | 15 | -66/+310 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Fix JavaScript translations that are using a namespacefix-js-translations | Ruben Davila | 2017-05-18 | 6 | -11/+11 |
| |/ / / / |/| | | | | |||||
* | | | | | Merge branch 'delete-old-mr-widget' into 'master' | Fatih Acet | 2017-05-18 | 1 | -303/+0 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Delete merge_request_widget.js See merge request !11452 | ||||
| * | | | | | Delete merge_request_widget.jsdelete-old-mr-widget | Luke "Jared" Bennett | 2017-05-17 | 1 | -303/+0 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Fix clicking disabled clipboard button toolip | Luke "Jared" Bennett | 2017-05-18 | 1 | -2/+2 |
| |/ / / |/| | | |