summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Use a btn-group to group all action buttons24651-environments-list-buttonsFilipa Lacerda2017-02-213-39/+42
|
* Merge branch 'zj-upgrade-rails' into 'master'Robert Speicher2017-02-212-46/+43
|\ | | | | | | | | Upgrade Rails to 4.2.8 See merge request !9419
| * Upgrade Rails to 4.2.8Z.J. van de Weg2017-02-212-46/+43
| |
* | Merge branch 'rename-retry-failed-pipeline-to-retry' into 'master' Filipa Lacerda2017-02-217-13/+17
|\ \ | | | | | | | | | | | | Rename retry failed button on pipeline page to just retry See merge request !9369
| * | Fix broken testFilipa Lacerda2017-02-212-2/+2
| | |
| * | Fix broken testrename-retry-failed-pipeline-to-retryFilipa Lacerda2017-02-211-2/+2
| | |
| * | fix more testsdimitrieh2017-02-212-3/+3
| | |
| * | fixed specs + docsdimitrieh2017-02-205-12/+12
| | |
| * | Rename retry failed button on pipeline page to just retrydimitrieh2017-02-202-1/+5
| | |
* | | Merge branch 'sh-delete-user-permission-check' into 'master' Stan Hu2017-02-214-5/+36
|\ \ \ | | | | | | | | | | | | | | | | 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-204-5/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-212-1/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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-212-1/+5
| | |_|/ | |/| |
* | | | Merge branch 'hash-concurrent-foreign-key-names' into 'master'Rémy Coutable2017-02-212-1/+20
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Hash concurrent foreign key names similar to Rails See merge request !9415
| * | | | Hash concurrent foreign key names similar to Railshash-concurrent-foreign-key-namesYorick Peterse2017-02-212-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was initially not implemented simply because I forgot about the size limit of constraint names in PostgreSQL (63 bytes). Using the old technique we can't add foreign keys for certain tables. For example, adding a foreign key on protected_branch_merge_access_levels.protected_branch_id would lead to the following key name: fk_protected_branch_merge_access_levels_protected_branches_protected_branch_id This key is 78 bytes long, thus violating the PostgreSQL size requirements. The hashing strategy is copied from Rails' foreign_key_name() method, which unfortunately is private and subject to change without notice.
* | | | | Merge branch '26879-fix-preselected-namespace-when-creating-project' into ↵Rémy Coutable2017-02-213-1/+50
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix preselected namespace when creating a project Closes #26879 See merge request !9389
| * | | | | Fix preselected namespace when creating a projectDavid Piegza2017-02-213-1/+50
| | | | | |
* | | | | | Merge branch 'api-todos-restful' into 'master' Sean McGivern2017-02-218-26/+130
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use POST methods to mark Todos as done Closes #28467 See merge request !9410
| * | | | | | Backport Todos API to V3api-todos-restfulRobert Schilling2017-02-213-0/+102
| | | | | | |
| * | | | | | API: Use POST requests to mark todos as doneRobert Schilling2017-02-215-26/+28
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'mr-origin-8390' into 'master' Rémy Coutable2017-02-211-6/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update using_docker_images.md See merge request !9417
| * | | | | | Update using_docker_images.mdAdam Boseley2017-02-211-6/+9
| | |_|/ / / | |/| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | Merge branch 'group-memebrs-owner-level' into 'master'Sean McGivern2017-02-213-1/+20
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-163-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #28233
* | | | | | | Merge branch 'snippets-search' into 'master'Sean McGivern2017-02-212-31/+28
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed alignment of snippet search results Closes #26832 See merge request !9228
| * | | | | | Fixed alignment of snippet search resultssnippets-searchPhil Hughes2017-02-142-31/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-213-13/+52
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-203-13/+52
| | | | | | | |
* | | | | | | | Merge branch 'patch-1' into 'master'Rémy Coutable2017-02-211-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update GitLab CE/EE comparison & subscribe links in README.md See merge request !9404
| * | | | | | | | Update GitLab CE/EE comparison & subscribe links in README.mdPeter Dave Hello2017-02-211-1/+1
| | | | | | | | |
* | | | | | | | | Merge branch 'dropdown-loading-class-add' into 'master' Filipa Lacerda2017-02-212-1/+4
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Changes when loading indicator is added to dropdown See merge request !9345
| * | | | | | | | Fixed eslint errordropdown-loading-class-addPhil Hughes2017-02-201-1/+1
| | | | | | | | |
| * | | | | | | | Fixed ref switcher testsPhil Hughes2017-02-201-0/+2
| | | | | | | | |
| * | | | | | | | 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-214-2/+32
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow searching issues for strings containing colons Closes #28357 See merge request !9400
| * | | | | | | | Allow searching issues for strings containing colonsSimon Knox2017-02-214-2/+32
| |/ / / / / / /
* | | | | | | | Merge branch 'add-approving-license-process' into 'master' Clement Ho2017-02-211-0/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add process for requesting approval for licenses Closes gitlab-com/organization#22 See merge request !9242
| * | | | | | | | Add process for requesting approval for licensesadd-approving-license-processClement Ho2017-02-171-0/+7
| | | | | | | | |
* | | | | | | | | Merge branch 'fix-spinach-failure' into 'master' Robert Speicher2017-02-211-0/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Spinach failure See merge request !9401
| * | | | | | | | | Fix Spinach failurefix-spinach-failureDouwe Maan2017-02-201-0/+1
| | | | | | | | | |
* | | | | | | | | | Merge branch '26206-fix-download-dropdown' into 'master' Clement Ho2017-02-203-0/+16
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | | | | | | |
| * | | | | | | | | | Update MR numberKushal Pandya2017-02-091-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Add changelog entryKushal Pandya2017-02-091-0/+4
| | | | | | | | | | |
| * | | | | | | | | | Set dropdown height fixed to `250px;` and make it scrollableKushal Pandya2017-02-091-0/+2
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'rename-karma-job' into 'master' Alfredo Sumaran2017-02-201-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename karma job to rake karma See merge request !9342
| * | | | | | | | | | Rename karma job to rake karmarename-karma-jobClement Ho2017-02-171-2/+2
| | | | | | | | | | |
* | | | | | | | | | | Merge branch '27934-left-align-nav' into 'master' Alfredo Sumaran2017-02-207-105/+84
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Left align nav items" Closes #27934 See merge request !9338