Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Support uploaders for personal snippets comments12910-uploader-pers-snippet | Jarka Kadlecova | 2017-05-02 | 4 | -2/+261 |
| | |||||
* | Merge branch 'rs-add_column_with_default_cops' into 'master' | Sean McGivern | 2017-05-01 | 2 | -2/+46 |
|\ | | | | | | | | | | | | | Add cop to blacklist specific tables for `add_column_with_default` Closes #31293 See merge request !10892 | ||||
| * | Add AddColumnWithDefaultToLargeTable cop | Robert Speicher | 2017-04-28 | 1 | -0/+44 |
| | | |||||
| * | Rename AddColumnWithDefault to ReversibleAddColumnWithDefault | Robert Speicher | 2017-04-28 | 1 | -2/+2 |
| | | | | | | | | | | We're going to add another cop that deals with another aspect of `add_column_with_default`, so we need to separate them. | ||||
* | | Revert "Merge branch 'tc-no-todo-service-select' into 'master'"revert-c3c465ac | Stan Hu | 2017-04-29 | 1 | -31/+17 |
| | | | | | | This reverts merge request !10845 | ||||
* | | Another change from .click -> .trigger('click') to make spec pass | Stan Hu | 2017-04-28 | 1 | -1/+1 |
| | | |||||
* | | Change from .click -> .trigger('click') to make spec passrs-trigger-click | Robert Speicher | 2017-04-28 | 1 | -1/+1 |
|/ | |||||
* | Merge branch 'tc-no-todo-service-select' into 'master' | Robert Speicher | 2017-04-28 | 1 | -17/+31 |
|\ | | | | | | | | | | | | | Avoid plucking Todo ids in TodoService Closes #30374 See merge request !10845 | ||||
| * | Avoid plucking Todo ids and use sub-queries insteadtc-no-todo-service-select | Toon Claes | 2017-04-27 | 1 | -17/+31 |
| | | | | | | | | | | | | | | | | TodoService should not call `.select(&:id)` on todos, because this is bad performance. So instead use sub-queries, which will result in a single SQL query to the database. https://docs.gitlab.com/ee/development/sql.html#plucking-ids | ||||
* | | Resolve "rspec_profiling is enabled for MySQL" | Rémy Coutable | 2017-04-28 | 1 | -2/+3 |
| | | |||||
* | | Merge branch 'enable-spec-file-name-cop' into 'master' | Robert Speicher | 2017-04-28 | 35 | -587/+342 |
|\ \ | | | | | | | | | | | | | | | | | | | Enable RSpec/FilePath cop Closes #31316 See merge request !10911 | ||||
| * | | Enable RSpec/FilePath copenable-spec-file-name-cop | Sean McGivern | 2017-04-26 | 35 | -587/+342 |
| | | | | | | | | | | | | | | | | | | - Ignore JS fixtures - Ignore qa directory - Rewrite concern specs to put concern name first | ||||
* | | | Merge branch 'dm-pull-preserve-into-render-helpers' into 'master' | Sean McGivern | 2017-04-28 | 2 | -2/+2 |
|\ \ \ | | | | | | | | | | | | | | | | | Pull preserve into render helpers See merge request !10986 | ||||
| * | | | Pull preserve into render helpers | Douwe Maan | 2017-04-28 | 2 | -2/+2 |
| | | | | |||||
* | | | | Merge branch 'dz-add-oauth-controller-spec' into 'master' | Rémy Coutable | 2017-04-28 | 1 | -0/+55 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Add tests for Oauth::AuthorizationsController See merge request !10982 | ||||
| * | | | | Add tests for Oauth::AuthorizationsControllerdz-add-oauth-controller-spec | Dmitriy Zaporozhets | 2017-04-28 | 1 | -0/+55 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | | | Merge branch 'dz-improve-add-users-method' into 'master' | Douwe Maan | 2017-04-28 | 1 | -2/+4 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Collect all users by single query when using Member#add_users See merge request !10975 | ||||
| * | | | | | Collect all users by single query when using Member#add_usersdz-improve-add-users-method | Dmitriy Zaporozhets | 2017-04-28 | 1 | -2/+4 |
| |/ / / / | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | | | Merge branch '28020-improve-todo-list-when-comes-from-yourself' into 'master' | Sean McGivern | 2017-04-28 | 3 | -2/+125 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve text on todo list when the todo action comes from yourself Closes #28020 See merge request !10594 | ||||
| * | | | | | Improve text on todo list when the todo action comes from yourself | Jacopo | 2017-04-28 | 3 | -2/+125 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improved todo message when an issue is assigned to yourself. - The new message when an user assign to himself an issue or a mr is: "You assigned issue xx to yourself" - The new message when an user adds a todo to himself is: "You added a todo for issue xx" - The new message when and user mention himself is: "You mentioned yourself on issue xx" - The new message when an user directly address himself is: "You directly addressed yourself on issue xx" - The new message when an user mark himself as an approver is: "You set yourself as an approver for merge request xx" | ||||
* | | | | | | Merge branch 'fix-sidebar-block-ref-test' into 'master' | Sean McGivern | 2017-04-28 | 1 | -3/+2 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | add issues and merge-requests classes and use to find in rspec See merge request !10980 | ||||
| * | | | | | add issues and merge-requests classes and use to find in rspecfix-sidebar-block-ref-test | Luke "Jared" Bennett | 2017-04-28 | 1 | -3/+2 |
| | | | | | | |||||
* | | | | | | Merge branch 'grpc-fork-tests' into 'master' 24339-job-page-step-2 | Sean McGivern | 2017-04-28 | 1 | -0/+98 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | Unicorn worker termination tests See merge request !10818 | ||||
| * | | | | | Remove config lines in one place | Jacob Vosmaer | 2017-04-28 | 1 | -3/+3 |
| | | | | | | |||||
| * | | | | | Use rspec 'be' | Jacob Vosmaer | 2017-04-28 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Refactor timeout code | Jacob Vosmaer | 2017-04-28 | 1 | -8/+17 |
| | | | | | | |||||
| * | | | | | Add test that asserts unicorns terminate | Jacob Vosmaer | 2017-04-26 | 1 | -0/+89 |
| | | | | | | |||||
* | | | | | | Add board_move slash command | Alex Sanford | 2017-04-28 | 1 | -8/+78 |
| | | | | | | |||||
* | | | | | | Resolve "Add more tests for spec/controllers/projects/builds_controller_spec.rb" | Dosuken shinya | 2017-04-28 | 6 | -14/+477 |
| | | | | | | |||||
* | | | | | | Merge branch 'dm-blob-viewers' into 'master' | Tim Zallmann | 2017-04-28 | 10 | -153/+1066 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor rich blob viewers and add Code|Rendered switch Closes #24287 See merge request !10566 | ||||
| * | | | | | | Use new renamed markup methoddm-blob-viewers | Douwe Maan | 2017-04-27 | 1 | -0/+2 |
| | | | | | | | |||||
| * | | | | | | Address feedback | Douwe Maan | 2017-04-27 | 3 | -28/+34 |
| | | | | | | | |||||
| * | | | | | | Added specs for JS method to switch views | Phil Hughes | 2017-04-27 | 1 | -2/+39 |
| | | | | | | | |||||
| * | | | | | | Fixed failing JS tests | Phil Hughes | 2017-04-27 | 1 | -3/+7 |
| | | | | | | | |||||
| * | | | | | | Satisfy Rubocop | Douwe Maan | 2017-04-27 | 2 | -2/+0 |
| | | | | | | | |||||
| * | | | | | | Add specs | Douwe Maan | 2017-04-27 | 9 | -45/+898 |
| | | | | | | | |||||
| * | | | | | | Render viewer error synchronously so that 'view the source' link will work | Douwe Maan | 2017-04-27 | 5 | -12/+7 |
| | | | | | | | |||||
| * | | | | | | Add test stubs | Douwe Maan | 2017-04-27 | 7 | -191/+31 |
| | | | | | | | |||||
| * | | | | | | Fix some specs | Douwe Maan | 2017-04-27 | 2 | -5/+5 |
| | | | | | | | |||||
| * | | | | | | Add specs | Douwe Maan | 2017-04-27 | 3 | -13/+191 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge branch 'dm-fix-ghost-user-validation' into 'master' | Robert Speicher | 2017-04-27 | 1 | -0/+10 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Skip validation when creating internal (ghost, service desk) users See merge request !10949 | ||||
| * | | | | | | Skip validation when creating internal (ghost, service desk) usersdm-fix-ghost-user-validation | Douwe Maan | 2017-04-26 | 1 | -0/+10 |
| | | | | | | | |||||
* | | | | | | | Merge branch '31138-improve-test-settings-for-services-in-empty-projects' ↵ | Douwe Maan | 2017-04-27 | 3 | -29/+75 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' improves test settings for chat notification services for empty projects Closes #31138 See merge request !10886 | ||||
| * | | | | | | | improves test settings for chat notification services for empty projects31138-improve-test-settings-for-services-in-empty-projects | Tiago Botelho | 2017-04-27 | 3 | -29/+75 |
| | | | | | | | | |||||
* | | | | | | | | Make api/v3/deployments_spec to actually tests v3dz-fix-v3-api-deployments-spec | Dmitriy Zaporozhets | 2017-04-27 | 1 | -6/+6 |
| |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | | | | | Merge branch 'remove-invalid-services' into 'master' | Douwe Maan | 2017-04-27 | 5 | -24/+38 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove invalid services with nil or empty type See merge request !10847 | ||||
| * | | | | | | | tadds migration to remove invalid services | Tiago Botelho | 2017-04-27 | 5 | -25/+35 |
| | | | | | | | | |||||
| * | | | | | | | remove invalid services | Tiago Botelho | 2017-04-26 | 1 | -0/+4 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch ↵ | Sean McGivern | 2017-04-27 | 1 | -0/+24 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '31292-milestone-sidebar-display-incorect-number-of-mr-when-minimized' into 'master' Resolve "Milestone sidebar display incorect number of MR when minimized" Closes #31292 See merge request !10933 | ||||
| * | | | | | | | | Added test31292-milestone-sidebar-display-incorect-number-of-mr-when-minimized | Luke "Jared" Bennett | 2017-04-26 | 1 | -0/+24 |
| | | | | | | | | |