Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'remove-paginated-ressource' into 'master' | Rémy Coutable | 2017-02-20 | 7 | -44/+6 |
|\ | | | | | | | | | Remove shared example for pagination See merge request !9377 | ||||
| * | Remove shared example for paginationremove-paginated-ressource | Robert Schilling | 2017-02-20 | 7 | -44/+6 |
| | | |||||
* | | Merge branch 'api-star-restful' into 'master' | Rémy Coutable | 2017-02-20 | 1 | -4/+4 |
|\ \ | | | | | | | | | | | | | | | | | | | API: Moved `DELETE /projects/:id/star` to `POST /projects/:id/unstar` Closes #28328 See merge request !9328 | ||||
| * | | API: Moved `DELETE /projects/:id/star` to `POST /projects/:id/unstar`api-star-restful | Robert Schilling | 2017-02-20 | 1 | -4/+4 |
| | | | |||||
* | | | Merge branch 'zj-improve-performance-user-agent-details' into 'master' | Rémy Coutable | 2017-02-20 | 1 | -1/+17 |
|\ \ \ | | | | | | | | | | | | | | | | | Improve performance of User Agent Detail See merge request !9129 | ||||
| * | | | Improve performance of User Agent Detail | Z.J. van de Weg | 2017-02-20 | 1 | -1/+17 |
| |/ / | |||||
* | | | Merge branch 'api-post-block' into 'master' | Sean McGivern | 2017-02-20 | 2 | -15/+84 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | API: Use POST to (un)block a user Closes #14596 See merge request !9371 | ||||
| * | | | API: Use POST to (un)block a userapi-post-block | Robert Schilling | 2017-02-20 | 2 | -15/+84 |
| | |/ | |/| | |||||
* | | | Merge branch 'api-grape-datetime' into 'master' | Rémy Coutable | 2017-02-20 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | | | | | | | Use grape validation for dates See merge request !9375 | ||||
| * | | Use grape validation for datesapi-grape-datetime | Robert Schilling | 2017-02-20 | 1 | -1/+1 |
| |/ | |||||
* | | Merge branch '21240_snippets_line_ending' into 'master' | Sean McGivern | 2017-02-20 | 2 | -0/+51 |
|\ \ | | | | | | | | | | | | | | | | | | | Download snippets with LF line-endings by default Closes #21240 See merge request !8999 | ||||
| * | | Download snippets with LF line-endings by default | Jarka Kadlecova | 2017-02-20 | 2 | -0/+51 |
| | | | |||||
* | | | Merge branch 'sh-fix-project-team-truncation-in-destroy' into 'master' | Rémy Coutable | 2017-02-20 | 1 | -0/+19 |
|\ \ \ | |_|/ |/| | | | | | | | | 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-destroy | Stan Hu | 2017-02-19 | 1 | -0/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | | Merge branch 'api-remove-deploy-key-disable' into 'master' | Sean McGivern | 2017-02-20 | 1 | -21/+0 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | API: Remove `DELETE projects/:id/deploy_keys/:key_id/disable` Closes #28286 See merge request !9366 | ||||
| * | | | API: Remove `DELETE projects/:id/deploy_keys/:key_id/disable`api-remove-deploy-key-disable | Robert Schilling | 2017-02-20 | 1 | -21/+0 |
| |/ / | |||||
* | | | Merge branch 'remove-imports-loader-window-bind' into 'master' | Filipa Lacerda | 2017-02-20 | 24 | -24/+24 |
|\ \ \ | |/ / |/| | | | | | | | | Remove window-binding hack with imports-loader See merge request !9123 | ||||
| * | | fix overlooked window binding in spec filesremove-imports-loader-window-bind | Mike Greiling | 2017-02-17 | 24 | -24/+24 |
| | | | |||||
* | | | Merge branch '25465-todo-done-clicking-is-kind-of-unsafe' into 'master' | Clement Ho | 2017-02-18 | 4 | -48/+94 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Todo done clicking is kind of unusable. Closes #25465 See merge request !8691 | ||||
| * | | | Todo done clicking is kind of unusable. | Jacopo | 2017-02-17 | 4 | -48/+94 |
| | | | | | | | | | | | | | | | | | | | | | | | | The Done button will change to an Undo button and the line item will be greyed out. Bold links will be unbolded. The user can undo the task by clicking the Undo button. | ||||
* | | | | Merge branch 'global-dropdown-edits' into 'master' | Alfredo Sumaran | 2017-02-17 | 1 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Global dropdown edits See merge request !9336 | ||||
| * | | | | Fix issuables_counter_specglobal-dropdown-edits | Annabel Dunstone Gray | 2017-02-17 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | Fix grammer issue in admin/runners28353-little-grammar-issue | Clement Ho | 2017-02-17 | 1 | -1/+1 |
| |_|/ / |/| | | | |||||
* | | | | Merge branch 'rc/backport-ee-fix' into 'master' | Robert Speicher | 2017-02-17 | 2 | -5/+5 |
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | Truncate the DB in after(:all) test for Gitlab::ImportExport::ProjectTreeRestorer See merge request !9339 | ||||
| * | | | Truncate the DB in after(:all) test for ↵rc/backport-ee-fix | Rémy Coutable | 2017-02-17 | 2 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | Gitlab::ImportExport::ProjectTreeRestorer Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | | | Merge branch '26379-iid-param' into 'master' | Rémy Coutable | 2017-02-17 | 2 | -3/+11 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add a :iid param to the IssuableFinder Closes #26379 See merge request !9222 | ||||
| * | | | | add a :iids param to IssuableFinder | mhasbini | 2017-02-17 | 2 | -3/+11 |
| | | | | | |||||
* | | | | | Merge branch 'boards-sidebar-spec-refactor' into 'master' | Rémy Coutable | 2017-02-17 | 1 | -86/+53 |
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | Refactor boards sidebar spec Closes #28310 See merge request !9330 | ||||
| * | | | | Reduced sidebar wait timeoutboards-sidebar-spec-refactor | Phil Hughes | 2017-02-17 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Refactor boards sidebar spec | Phil Hughes | 2017-02-17 | 1 | -86/+53 |
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | - Uses Timecop to fix due date spec - Waits for sidebar to be visible before doing anything - Fixes weird issues where the link would be clicked instead of the card itself Closes #28310 | ||||
* | | | | Merge branch 'gfm-autocomplete-fixes' into 'master' | Alfredo Sumaran | 2017-02-17 | 1 | -0/+57 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Fix errors in GFM slash commands matcher See merge request !8975 | ||||
| * | | | | Fixes errors in GFM slash commands matcher and add tests for default matcher | YarNayar | 2017-02-17 | 1 | -0/+57 |
| | | | | | | | | | | | | | | | | | | | | See !8975 | ||||
* | | | | | Merge branch 'dynamic-project-title-fixture' into 'master' | Clement Ho | 2017-02-17 | 2 | -31/+8 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Replace static fixture for project_title_spec.js See merge request !9175 | ||||
| * | | | | | Replace static fixture for project_title_spec.js (!9175) | winniehell | 2017-02-13 | 2 | -31/+8 |
| | | | | | | |||||
* | | | | | | Merge branch 'fix/gb/pipeline-retry-builds-started' into 'master' | Kamil Trzciński | 2017-02-17 | 11 | -44/+440 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make pipeline retry take stages order into account Closes #27431, #23710, and #26551 See merge request !9021 | ||||
| * \ \ \ \ \ | Merge branch 'master' into fix/gb/pipeline-retry-builds-started | Grzegorz Bizon | 2017-02-17 | 137 | -1355/+3949 |
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (313 commits) Allow slashes in slash command arguments Add API endpoint to get all milestone merge requests remove trailing comma Restore pagination to admin abuse reports replace deprecated NoErrorsPlugin with NoEmitOnErrorsPlugin only compress assets in production Reduce number of pipelines created to test pagination add CHANGELOG.md entry for !8761 prevent diff unfolding link from appearing for deleted files fix build failures only show diff unfolding link if there are more lines to show fix typo in node section Only yield valid references in ReferenceFilter.references_in Cache js selectors; fix css move "Install node modules" step before "Migrate DB" within update process Renders pagination again for pipelines table update migration docs for 8.17 to include minimum node version Add CHANGELOG file Fix positioning of top scroll button Remove comments in migration ... | ||||
| * | | | | | | Make build clone/retry implementation more robustfix/gb/pipeline-retry-builds-started | Grzegorz Bizon | 2017-02-16 | 2 | -17/+32 |
| | | | | | | | |||||
| * | | | | | | Add test for cloning attributes when retrying a build | Grzegorz Bizon | 2017-02-15 | 1 | -0/+32 |
| | | | | | | | |||||
| * | | | | | | Prefer using `project.add_developer` in specs | Grzegorz Bizon | 2017-02-15 | 5 | -9/+9 |
| | | | | | | | |||||
| * | | | | | | Close all pipeline todos at once when retrying it | Grzegorz Bizon | 2017-02-15 | 1 | -0/+13 |
| | | | | | | | |||||
| * | | | | | | Make it possible to resolve all todos for pipeline | Grzegorz Bizon | 2017-02-15 | 1 | -1/+24 |
| | | | | | | | |||||
| * | | | | | | Add specs for after_stage scope, update specs file | Grzegorz Bizon | 2017-02-14 | 1 | -4/+18 |
| | | | | | | | |||||
| * | | | | | | Extend specs for build and pipeline retry services | Grzegorz Bizon | 2017-02-14 | 2 | -16/+87 |
| | | | | | | | |||||
| * | | | | | | Simplify implementation of pipeline retry service | Grzegorz Bizon | 2017-02-14 | 2 | -16/+35 |
| | | | | | | | |||||
| * | | | | | | Preserve base service abstraction for retry services | Grzegorz Bizon | 2017-02-14 | 2 | -14/+14 |
| | | | | | | | |||||
| * | | | | | | Implement new pipeline retry service | Grzegorz Bizon | 2017-02-13 | 1 | -1/+50 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new service takes stages order into account. | ||||
| * | | | | | | Add a separate CI/CD pipeline retry service class | Grzegorz Bizon | 2017-02-13 | 1 | -0/+48 |
| | | | | | | | |||||
| * | | | | | | Fix envs and deploys specs related to build retry | Grzegorz Bizon | 2017-02-13 | 2 | -2/+6 |
| | | | | | | | |||||
| * | | | | | | Fix pipeline processing specs after adding ability checks | Grzegorz Bizon | 2017-02-13 | 1 | -3/+11 |
| | | | | | | | |||||
| * | | | | | | Fix pipeline specs after adding retry ability check | Grzegorz Bizon | 2017-02-13 | 1 | -8/+16 |
| | | | | | | |