Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fix overlooked window binding in spec filesremove-imports-loader-window-bind | Mike Greiling | 2017-02-17 | 24 | -24/+24 |
| | |||||
* | 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 |
| | | | | | | |||||
| * | | | | | Fix CI build specs after adding retry ability check | Grzegorz Bizon | 2017-02-13 | 2 | -19/+31 |
| | | | | | | |||||
| * | | | | | Add specs for build retry service | Grzegorz Bizon | 2017-02-13 | 1 | -0/+56 |
| | | | | | | |||||
| * | | | | | Extend specs for canceling a running pipeline | Grzegorz Bizon | 2017-02-13 | 1 | -2/+15 |
| | | | | | | |||||
| * | | | | | Skip job only when canceling the pipeline it belongs to | Grzegorz Bizon | 2017-02-13 | 1 | -1/+4 |
| | | | | | | |||||
| * | | | | | Fix pipeline specs related to canceling builds | Grzegorz Bizon | 2017-02-13 | 1 | -2/+10 |
| | | | | | | |||||
* | | | | | | Merge branch 'task_list_refactor' into 'master' | Fatih Acet | 2017-02-17 | 2 | -10/+8 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | move task_list setup and events to own class See merge request !9016 | ||||
| * \ \ \ \ \ | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into task_list_refactortask_list_refactor | Simon Knox | 2017-02-16 | 39 | -451/+966 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | code style and test fixes | Simon Knox | 2017-02-14 | 2 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix test following https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9172 | ||||
| * | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into task_list_refactor | Simon Knox | 2017-02-14 | 8 | -60/+109 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into task_list_refactor | Simon Knox | 2017-02-14 | 147 | -741/+4719 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | update karma test to expect ajax instead of POST | Simon Knox | 2017-02-09 | 1 | -8/+6 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'move-spinach-dashboard-issues-test-to-rspec' into 'master' | Rémy Coutable | 2017-02-17 | 1 | -0/+48 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move dashboard issues spinach test to Rspec See merge request !8955 | ||||
| * | | | | | | | | | | Move dashboard issues spinach test to Rspec | Semyon Pupkov | 2017-02-10 | 1 | -0/+48 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/23036 | ||||
* | | | | | | | | | | | Merge branch 'issue_26714' into 'master' | Rémy Coutable | 2017-02-17 | 1 | -2/+4 |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix 'reset-email' link spec Closes #26714 See merge request !9317 | ||||
| * | | | | | | | | | | | Fix 'reset-email' link specissue_26714 | Felipe Artur | 2017-02-16 | 1 | -2/+4 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'paginate-all-the-things' into 'master' | Rémy Coutable | 2017-02-17 | 40 | -47/+837 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Paginate all the things Closes #8099 See merge request !8606 | ||||
| * | | | | | | | | | | | Backport API to v3paginate-all-the-things | Robert Schilling | 2017-02-17 | 7 | -0/+544 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Add a custom pagination matcher | Robert Schilling | 2017-02-16 | 33 | -36/+274 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Paginate all endpoints that return an array | Robert Schilling | 2017-02-16 | 4 | -11/+19 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch '26500-informative-slack-notifications' into 'master' | Kamil Trzciński | 2017-02-17 | 4 | -4/+72 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding links to user & build stage in a Build message Closes #26500 See merge request !8641 | ||||
| * | | | | | | | | | | | | Adding links to user & build in Chat Notifications | Poornima M | 2017-01-25 | 4 | -4/+72 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge branch 'use-update-runner-service' into 'master' | Kamil Trzciński | 2017-02-17 | 5 | -1/+228 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prefer service object over after_save hook Closes #26921 See merge request !8664 |