Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'winh-frontend-user-cache' into 'master' | Filipa Lacerda | 2017-05-23 | 2 | -0/+201 |
|\ | | | | | | | | | 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/+136 |
| | | |||||
| * | Extract Cache class from AjaxCache | winh | 2017-05-21 | 1 | -0/+65 |
| | | |||||
* | | Merge branch 'winh-recent-searches-service-spec' into 'master' | Fatih Acet | 2017-05-23 | 1 | -22/+30 |
|\ \ | | | | | | | | | | | | | Handle Promise rejections in RecentSearchesService spec See merge request !11206 | ||||
| * | | Handle Promise rejections in RecentSearchesService spec (!11206)winh-recent-searches-service-spec | winh | 2017-05-11 | 1 | -22/+30 |
| | | | |||||
* | | | Merge branch 'adopt-es-module-syntax' into 'master' | Filipa Lacerda | 2017-05-22 | 54 | -150/+146 |
|\ \ \ | |_|/ |/| | | | | | | | | Adopt ES module syntax See merge request !9567 | ||||
| * | | refactor instances of CJS module.exports to ES module syntax | Mike Greiling | 2017-05-16 | 2 | -6/+2 |
| | | | |||||
| * | | fix eslint failures | Mike Greiling | 2017-05-16 | 4 | -4/+4 |
| | | | |||||
| * | | fix implicit window object reference within gl_form_spec | Mike Greiling | 2017-05-16 | 1 | -6/+6 |
| | | | |||||
| * | | update test_bundle to use ES module syntax | Mike Greiling | 2017-05-16 | 1 | -6/+8 |
| | | | |||||
| * | | update frontend specs to use ES module syntax | Mike Greiling | 2017-05-16 | 51 | -131/+129 |
| | | | |||||
* | | | Add users endpoint to frontend API class | Winnie Hellmann | 2017-05-19 | 1 | -0/+281 |
| | | | |||||
* | | | Merge branch '32536-mr-widget-performance-improvements' into 'master' | Fatih Acet | 2017-05-19 | 1 | -2/+0 |
|\ \ \ | | | | | | | | | | | | | | | | | Load improvements related to MR widget See merge request !11518 | ||||
| * | | | Fix Karma expect | Oswaldo Ferreira | 2017-05-18 | 1 | -1/+0 |
| | | | | |||||
| * | | | Remove unnecessary initial request | Oswaldo Ferreira | 2017-05-18 | 1 | -1/+0 |
| | | | | |||||
* | | | | Refine MR widget styling for buttons and info text | Kushal Pandya | 2017-05-19 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch '32551-fix-system-note-comparison-and-standardize-note-setup' ↵ | Filipa Lacerda | 2017-05-19 | 1 | -0/+1 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | -0/+1 |
| |/ / / | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32551 | ||||
* | | | | Merge branch 'user-avatar-vue-ce' into 'master' | Phil Hughes | 2017-05-19 | 7 | -5/+138 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Consolidate user avatar Vue logic Closes #31017 See merge request !10718 | ||||
| * | | | | Fixes per feedback on user avatar components. | Bryce Johnson | 2017-05-18 | 4 | -69/+12 |
| | | | | | |||||
| * | | | | Consolidate user avatar Vue logic | Bryce Johnson | 2017-05-18 | 8 | -5/+195 |
| |/ / / | |||||
* | | | | Fix clicking disabled clipboard button toolip | Luke "Jared" Bennett | 2017-05-18 | 1 | -4/+27 |
|/ / / | |||||
* | | | Fix ability to edit diff notes multiple times | Kushal Pandya | 2017-05-18 | 1 | -0/+41 |
| | | | |||||
* | | | Fix missing .original-note-content and trailing new line edge case32449-fix-note-comparison-trailing-newline-edge-case | Eric Eastwood | 2017-05-18 | 1 | -8/+52 |
| | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32449 | ||||
* | | | Merge branch 'acet-mr-widget-nothing-to-commit-state' into 'master' | Filipa Lacerda | 2017-05-17 | 1 | -2/+14 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | MRWidget: Implement new design for nothing to commit state. Closes #29320 See merge request !11266 | ||||
| * | | | Address MR comments.acet-mr-widget-nothing-to-commit-state | Fatih Acet | 2017-05-16 | 1 | -1/+1 |
| | | | | |||||
| * | | | MRWidget: Fix specs and address WIP comments. | Fatih Acet | 2017-05-16 | 1 | -2/+14 |
| | | | | |||||
* | | | | Merge branch '32172-improve-responsive-styling-of-pipeline-schedules-form' ↵ | Tim Zallmann | 2017-05-17 | 1 | -42/+0 |
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Polish UI on pipeline schedules form Closes #32172 See merge request !11332 | ||||
| * | | | Clean up UI and styles. | Bryce Johnson | 2017-05-15 | 1 | -42/+0 |
| | | | | |||||
* | | | | Make `gfm_auto_complete` into a module and fix up tech debt | Eric Eastwood | 2017-05-16 | 1 | -9/+11 |
| |/ / |/| | | |||||
* | | | Merge branch '24373-warning-message-go-away' into 'master' | Phil Hughes | 2017-05-16 | 1 | -0/+29 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Notes warning message should go away once resolved Closes #24373 See merge request !10823 | ||||
| * | | | Notes: Warning message should go away once resolved | Jacopo | 2017-05-15 | 1 | -0/+29 |
| | | | | | | | | | | | | | | | | Flash error messages disappear(`fadeOut`) automatically after any successful request | ||||
* | | | | Merge branch 'issue-boards-label-filtering' into 'master' | Filipa Lacerda | 2017-05-16 | 1 | -0/+10 |
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | Fixed issue boards not filtering when URL params are encoded Closes #32084 See merge request !11320 | ||||
| * | | | Fixed issue boards not filtering when URL params are encoded | Phil Hughes | 2017-05-12 | 1 | -0/+10 |
| | | | | | | | | | | | | | | | | Closes #32084 | ||||
* | | | | Merge branch 'rename-rendered_title' into 'master' | Rémy Coutable | 2017-05-15 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Rename all references to rendered_title to realtime_changes See merge request !11359 | ||||
| * | | | | Rename all references to rendered_title to realtime_changesrename-rendered_title | Luke "Jared" Bennett | 2017-05-13 | 1 | -1/+1 |
| | |/ / | |/| | | |||||
* | | | | Improve slash command stripping, escape temporary note contents | Kushal Pandya | 2017-05-15 | 1 | -4/+42 |
| | | | | |||||
* | | | | Added balsamiq jasmine integration test | Luke "Jared" Bennett | 2017-05-15 | 4 | -27/+81 |
|/ / / | |||||
* | | | Removed all instances of Object.assign by using es6 classes, also includes ↵ | Luke "Jared" Bennett | 2017-05-12 | 2 | -51/+10 |
| | | | | | | | | | | | | some … | ||||
* | | | Consistently use monospace font for commit SHAs and branch and tag names | Douwe Maan | 2017-05-12 | 2 | -5/+5 |
| | | | |||||
* | | | Merge branch 'acet-mr-widget-fix-link' into 'master' | Filipa Lacerda | 2017-05-12 | 2 | -5/+12 |
|\ \ \ | | | | | | | | | | | | | | | | | MRWidget: Fix target branch link. See merge request !11267 | ||||
| * | | | MRWidget: Use targetBranchPath in everywhere.acet-mr-widget-fix-link | Fatih Acet | 2017-05-12 | 2 | -4/+4 |
| | | | | |||||
| * | | | MRWidget: Fix target branch link. | Fatih Acet | 2017-05-12 | 1 | -3/+10 |
| |/ / | |||||
* | | | Merge branch '32178-prevent-merge-on-sha-change' into 'master' | Fatih Acet | 2017-05-12 | 3 | -0/+41 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Add "SHA mismatch" state to the MR widget Closes #32178 See merge request !11316 | ||||
| * | | | ensure hasSHAChanged == true when setData includes a different SHA from ↵ | Mike Greiling | 2017-05-11 | 1 | -0/+22 |
| | | | | | | | | | | | | | | | | constructor | ||||
| * | | | ensure the correct state component is loaded when hasSHAChanged == true | Mike Greiling | 2017-05-11 | 1 | -0/+3 |
| | | | | |||||
| * | | | add test for sha-mismatch state component | Mike Greiling | 2017-05-11 | 1 | -0/+16 |
| |/ / | |||||
* | | | Uniform CI status components in vue | Filipa Lacerda | 2017-05-12 | 4 | -5/+103 |
| | | | |||||
* | | | Merge branch 'remove-vue-from-poll_spec-fix-transient-failures' into 'master' | Filipa Lacerda | 2017-05-12 | 1 | -71/+22 |
|\ \ \ | | | | | | | | | | | | | | | | | Fix poll_spec transient failures See merge request !11264 | ||||
| * | | | Removed unneeded false from poll_spec mockServiceCall callremove-vue-from-poll_spec-fix-transient-failures | Luke "Jared" Bennett | 2017-05-11 | 1 | -1/+1 |
| | | | |