summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* fixes delimiter removes when todo marked as doneNur Rony2017-02-221-2/+4
|
* Merge branch 'add-filtered-search-to-mr' into 'master' Alfredo Sumaran2017-02-229-46/+63
|\ | | | | | | | | | | | | Add filtered search to MR page Closes #27131 See merge request !9284
| * Add filtered search to MR pageadd-filtered-search-to-mrClement Ho2017-02-219-46/+63
| |
* | Merge branch 'dm-no-more-andor' into 'master'Robert Speicher2017-02-2213-21/+19
|\ \ | | | | | | | | | | | | No more and/or See merge request !9428
| * | No more and/orDouwe Maan2017-02-2113-21/+19
| | |
* | | Merge branch '26703-todos-count' into 'master' Clement Ho2017-02-216-2/+16
|\ \ \ | |/ / |/| | | | | | | | | | | | | | #26703 change todos counter position & format ( for large counts ) Closes #26703 See merge request !9171
| * | change todos counter position & format ( for large counts )mhasbini2017-02-216-2/+16
| | |
* | | Merge branch 'commit-search-ui-fix' into 'master' Annabel Dunstone Gray2017-02-211-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix the commit search UI Closes gitlab-ee#1765 See merge request !9411
| * | | Fix the commit search UIcommit-search-ui-fixPhil Hughes2017-02-211-1/+1
| | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/1765
* | | | Merge branch 'rename-retry-failed-pipeline-to-retry' into 'master' Filipa Lacerda2017-02-212-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Rename retry failed button on pipeline page to just retry See merge request !9369
| * | | | Fix broken testFilipa Lacerda2017-02-211-1/+1
| | | | |
| * | | | fix more testsdimitrieh2017-02-211-1/+1
| | | | |
| * | | | fixed specs + docsdimitrieh2017-02-201-1/+1
| | | | |
| * | | | Rename retry failed button on pipeline page to just retrydimitrieh2017-02-201-1/+1
| | | | |
* | | | | Merge branch 'sh-delete-user-permission-check' into 'master' Stan Hu2017-02-212-0/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add user deletion permission check in `Users::DestroyService` See merge request !8974
| * | | | | Add user deletion permission check in `Users::DestroyService`sh-delete-user-permission-checkStan Hu2017-02-202-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We saw from a recent incident that the `Users::DestroyService` would attempt to delete a user over and over. Revoking the permissions from the current user did not help. We should ensure that the current user does, in fact, have permissions to delete the user. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | Merge branch '28389-ux-problem-with-pipeline-coverage-placeholder' into ↵Annabel Dunstone Gray2017-02-211-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Changed coverage reg expression placeholder text to be more like a placeholder Closes #28389 See merge request !9407
| * | | | | | changed changelog text to be normal case28389-ux-problem-with-pipeline-coverage-placeholderdimitrieh2017-02-211-1/+1
| | | | | | |
| * | | | | | Changed coverage reg expression placeholder text to be more like a placeholderdimitrieh2017-02-211-1/+1
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch '26879-fix-preselected-namespace-when-creating-project' into ↵Rémy Coutable2017-02-212-1/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix preselected namespace when creating a project Closes #26879 See merge request !9389
| * | | | | | Fix preselected namespace when creating a projectDavid Piegza2017-02-212-1/+5
| | | | | | |
* | | | | | | Merge branch 'group-memebrs-owner-level' into 'master'Sean McGivern2017-02-211-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added ability to change user permissions in group to owner Closes #28233 See merge request !9299
| * | | | | | | Added ability to change user permissions in group to ownergroup-memebrs-owner-levelPhil Hughes2017-02-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #28233
* | | | | | | | Merge branch 'snippets-search' into 'master'Sean McGivern2017-02-211-31/+24
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed alignment of snippet search results Closes #26832 See merge request !9228
| * | | | | | | | Fixed alignment of snippet search resultssnippets-searchPhil Hughes2017-02-141-31/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also enabled syntaax highlight on the search results Closes #26832
* | | | | | | | | Merge branch '28186-long-group-names-overflow-out-of-todos-view' into 'master' Filipa Lacerda2017-02-212-13/+48
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Truncate long title text on Todo items Closes #28186 See merge request !9311
| * | | | | | | | Truncate long title text on Todo items28186-long-group-names-overflow-out-of-todos-viewSam Rose2017-02-202-13/+48
| | | | | | | | |
* | | | | | | | | Merge branch 'dropdown-loading-class-add' into 'master' Filipa Lacerda2017-02-211-1/+2
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Changes when loading indicator is added to dropdown See merge request !9345
| * | | | | | | | Fixed eslint errordropdown-loading-class-addPhil Hughes2017-02-201-1/+1
| | | | | | | | |
| * | | | | | | | Changes when loading indicator is added to dropdownPhil Hughes2017-02-201-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously it was added when you started typing. But there is actually a delay before sending any requests which meant the loading icon was visible but it wasn't actually loading anything
* | | | | | | | | Merge branch '28357-colon-search' into 'master' Clement Ho2017-02-212-2/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow searching issues for strings containing colons Closes #28357 See merge request !9400
| * | | | | | | | | Allow searching issues for strings containing colonsSimon Knox2017-02-212-2/+5
| |/ / / / / / / /
* | | | | | | | | Merge branch '26206-fix-download-dropdown' into 'master' Clement Ho2017-02-202-0/+12
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set dropdown height fixed to `250px;` and make it scrollable Closes #26206 See merge request !9063
| * | | | | | | | Set dropdown to fixed height of `250px` and make it scrollable26206-fix-download-dropdownKushal Pandya2017-02-092-0/+12
| | | | | | | | |
| * | | | | | | | Fix dropdown height regressionKushal Pandya2017-02-091-2/+0
| | | | | | | | |
| * | | | | | | | Set dropdown height fixed to `250px;` and make it scrollableKushal Pandya2017-02-091-0/+2
| | | | | | | | |
* | | | | | | | | Merge branch '27934-left-align-nav' into 'master' Alfredo Sumaran2017-02-206-105/+80
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Left align nav items" Closes #27934 See merge request !9338
| * | | | | | | | | Update positioning of nav scroll arrows27934-left-align-navAnnabel Dunstone Gray2017-02-171-4/+4
| | | | | | | | | |
| * | | | | | | | | Move tanuki to left of title; increase max-width of titleAnnabel Dunstone Gray2017-02-173-25/+6
| | | | | | | | | |
| * | | | | | | | | Refactor project stats & last_commit CSS; left align main nav itemsAnnabel Dunstone Gray2017-02-174-76/+70
| | | | | | | | | |
* | | | | | | | | | Merge branch 'dm-fix-editing-files-on-forks-quick' into 'master' Robert Speicher2017-02-201-12/+4
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix issue where files on a fork could not be edited Closes #28188 See merge request !9349
| * | | | | | | | | | Fix issue where files on a fork could not be editedDouwe Maan2017-02-171-12/+4
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'authentiq-backchannel-logout' into 'master' Douwe Maan2017-02-201-0/+7
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remote logout functionality on Authentiq OAuth provider See merge request !9381
| * | | | | | | | | Added support for Authentiq Back-Channel LogoutAlexandros Keramidas2017-02-201-0/+7
| | | | | | | | | |
* | | | | | | | | | Merge branch 'zj-improve-performance-user-agent-details' into 'master' Rémy Coutable2017-02-204-6/+10
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve performance of User Agent Detail See merge request !9129
| * | | | | | | | | Improve performance of User Agent DetailZ.J. van de Weg2017-02-204-6/+10
| | | | | | | | | |
* | | | | | | | | | Merge branch '21240_snippets_line_ending' into 'master' Sean McGivern2017-02-203-25/+24
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Download snippets with LF line-endings by default Closes #21240 See merge request !8999
| * | | | | | | | | | Download snippets with LF line-endings by defaultJarka Kadlecova2017-02-203-25/+24
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'sh-fix-project-team-truncation-in-destroy' into 'master' Rémy Coutable2017-02-201-2/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent project team from being truncated too early during project destruction See merge request !9361
| * | | | | | | | | | Prevent project team from being truncated too early during project destructionsh-fix-project-team-truncation-in-destroyStan Hu2017-02-191-2/+1
| | |_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are two issues with truncating the project team early: 1. `Projects::UnlinkForkService` may not close merge requests properly since permissions may be revoked early. 2. If an error is encountered during flushing of caches, then the user will lose all privileges, possibly causing an issue on deletion on retry.