Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update gitlab_git gem to 10.4.7fix/update-gitlab-git | Ahmad Sherif | 2016-08-17 | 3 | -3/+4 |
| | |||||
* | Merge branch '20808-merge-request-new-diff-view' into 'master' | Robert Speicher | 2016-08-17 | 3 | -1/+21 |
|\ | | | | | | | | | | | | | | | | | Fix merge request new view not changing code view rendering style Correctly respects the code view changing when creating a merge request. Closes #20808 See merge request !5768 | ||||
| * | Fix merge request new view not changing code view rendering style20808-merge-request-new-diff-view | Paco Guzman | 2016-08-11 | 3 | -1/+21 |
| | | |||||
* | | Merge branch 'issue-boards' into 'master' | Douwe Maan | 2016-08-17 | 89 | -85/+5635 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue boards ## What are the relevant issue numbers? - Issue: #17907 - Issue backend: #20335 - Backend MR: !5548 - Frontend MR: !5554 - Documentation !5713 ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [X] ~~[Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~ - [X] ~~API support added~~ - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5548 | ||||
| * \ | Merge branch 'issue-boards-ui' into 'issue-boards' | Jacob Schatz | 2016-08-17 | 41 | -89/+3884 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue boards UI ## What does this MR do? UI for issue boards. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## What are the relevant issue numbers? - Issue: #17907 - Backend MR: !5548 - Frontend MR: !5554 - Documentation !5713 ## Screenshots (if relevant)  See merge request !5554 | ||||
| | * | | Removed vue assets | Phil Hughes | 2016-08-17 | 2 | -10080/+0 |
| | | | | |||||
| | * | | Test update | Phil Hughes | 2016-08-17 | 1 | -20/+5 |
| | | | | | | | | | | | | | | | | It wasnt testing what it was saying it should be... | ||||
| | * | | Fixed failing test | Phil Hughes | 2016-08-17 | 1 | -0/+2 |
| | | | | |||||
| | * | | Added wait for vue in logged out & guest tests | Phil Hughes | 2016-08-17 | 1 | -0/+2 |
| | | | | |||||
| | * | | Fixed bug when moving list | Phil Hughes | 2016-08-17 | 2 | -2/+1 |
| | | | | |||||
| | * | | Removed if around board deleting | Phil Hughes | 2016-08-17 | 1 | -8/+10 |
| | | | | | | | | | | | | | | | | removed duplication | ||||
| | * | | Fixed permissions around create new list button | Phil Hughes | 2016-08-17 | 2 | -2/+28 |
| | | | | |||||
| | * | | Code improvements | Phil Hughes | 2016-08-17 | 3 | -41/+24 |
| | | | | |||||
| | * | | Improved code readability | Phil Hughes | 2016-08-17 | 9 | -124/+57 |
| | | | | |||||
| | * | | Testing builds | Phil Hughes | 2016-08-17 | 1 | -2/+15 |
| | | | | |||||
| | * | | Fix feature spec for issues board | Douglas Barbosa Alexandre | 2016-08-17 | 1 | -16/+32 |
| | | | | |||||
| | * | | Updated tests | Phil Hughes | 2016-08-17 | 1 | -9/+3 |
| | | | | |||||
| | * | | Updated teaspoon mock tests endpoints | Phil Hughes | 2016-08-17 | 1 | -4/+5 |
| | | | | |||||
| | * | | Updated tests for creating with board | Phil Hughes | 2016-08-17 | 1 | -2/+4 |
| | | | | |||||
| | * | | Tests updated | Phil Hughes | 2016-08-17 | 3 | -25/+14 |
| | | | | |||||
| | * | | Tests update | Phil Hughes | 2016-08-17 | 3 | -63/+93 |
| | | | | |||||
| | * | | Added vue resource interceptor | Phil Hughes | 2016-08-17 | 3 | -2/+41 |
| | | | | |||||
| | * | | Fix issue with paging not working sometimes | Phil Hughes | 2016-08-17 | 1 | -1/+1 |
| | | | | |||||
| | * | | Fixed some flexbox height issues | Phil Hughes | 2016-08-17 | 1 | -0/+5 |
| | | | | |||||
| | * | | Updated rspec to not use sleep when dragging | Phil Hughes | 2016-08-17 | 4 | -17/+20 |
| | | | | | | | | | | | | | | | | Fixed JS tests | ||||
| | * | | Uses dataset rather than jQuery to get attribute values | Phil Hughes | 2016-08-17 | 6 | -40/+45 |
| | | | | |||||
| | * | | Updated JSON endpoints | Phil Hughes | 2016-08-17 | 1 | -11/+8 |
| | | | | |||||
| | * | | Fixed bug when moving lists around & then deleting | Phil Hughes | 2016-08-17 | 5 | -13/+26 |
| | | | | |||||
| | * | | Fixed removing items from list | Phil Hughes | 2016-08-17 | 12 | -48/+1339 |
| | | | | |||||
| | * | | Fixed small screen bug not dragging | Phil Hughes | 2016-08-17 | 2 | -2/+2 |
| | | | | |||||
| | * | | Moved issue board components from being global | Phil Hughes | 2016-08-17 | 6 | -16/+39 |
| | | | | |||||
| | * | | Namespaced sortable default options function | Phil Hughes | 2016-08-17 | 3 | -6/+5 |
| | | | | |||||
| | * | | Moved board store to namespaced gl object | Phil Hughes | 2016-08-17 | 15 | -87/+88 |
| | | | | |||||
| | * | | Fixed blank state issue | Phil Hughes | 2016-08-17 | 4 | -10/+18 |
| | | | | | | | | | | | | | | | | Updated some parts based on feedback | ||||
| | * | | Fixed blank state nevermind button | Phil Hughes | 2016-08-17 | 5 | -7/+6 |
| | | | | |||||
| | * | | Removed underscorejs from create label class | Phil Hughes | 2016-08-17 | 1 | -1/+1 |
| | | | | |||||
| | * | | Added loading icon so user knows when new page is loading | Phil Hughes | 2016-08-17 | 5 | -5/+23 |
| | | | | | | | | | | | | | | | | Added test for finding lists when limited to type | ||||
| | * | | Create new label link text change | Phil Hughes | 2016-08-17 | 1 | -1/+1 |
| | | | | |||||
| | * | | Removes checkmarks from new list dropdown when deleting list | Phil Hughes | 2016-08-17 | 4 | -13/+20 |
| | | | | |||||
| | * | | Fixed bug when dragging to done list | Phil Hughes | 2016-08-17 | 1 | -3/+5 |
| | | | | |||||
| | * | | Fixed bug with creating new list from Backlog or done label | Phil Hughes | 2016-08-17 | 3 | -5/+27 |
| | | | | |||||
| | * | | Reverted milestone upcoming default filter | Phil Hughes | 2016-08-17 | 5 | -35/+26 |
| | | | | |||||
| | * | | Defaults milestone filter to upcoming | Phil Hughes | 2016-08-17 | 7 | -29/+39 |
| | | | | |||||
| | * | | Fixed bug with label filter dropdown not removing the correct label | Phil Hughes | 2016-08-17 | 1 | -2/+5 |
| | | | | |||||
| | * | | Updated simulateDrag JS | Phil Hughes | 2016-08-17 | 1 | -10/+5 |
| | | | | |||||
| | * | | Removed underscoreJS uses | Phil Hughes | 2016-08-17 | 14 | -130/+160 |
| | | | | | | | | | | | | | | | | Removed props on main VueJS app instead uses data variables | ||||
| | * | | Changed ghost to have a slight opacity | Phil Hughes | 2016-08-17 | 2 | -1/+2 |
| | | | | | | | | | | | | | | | | Disabled sorting in list | ||||
| | * | | Stop propogation when adding default lists | Phil Hughes | 2016-08-17 | 1 | -1/+2 |
| | | | | |||||
| | * | | Fixed error with class not existing | Phil Hughes | 2016-08-17 | 1 | -4/+4 |
| | | | | |||||
| | * | | Fixed failing teaspoon tests | Phil Hughes | 2016-08-17 | 6 | -14/+15 |
| | | | |