Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Support uploaders for personal snippets comments12910-uploader-pers-snippet | Jarka Kadlecova | 2017-05-02 | 22 | -103/+419 |
| | |||||
* | Update CHANGELOG.md for 9.1.2 | Timothy Andrew | 2017-05-01 | 9 | -32/+11 |
| | | | [ci skip] | ||||
* | Merge branch 'rs-add_column_with_default_cops' into 'master' | Sean McGivern | 2017-05-01 | 16 | -13/+121 |
|\ | | | | | | | | | | | | | Add cop to blacklist specific tables for `add_column_with_default` Closes #31293 See merge request !10892 | ||||
| * | Disable AddColumnWithDefaultToLargeTable cop for pre-existing migrationsrs-add_column_with_default_cops | Robert Speicher | 2017-04-28 | 11 | -0/+11 |
| | | |||||
| * | Add AddColumnWithDefaultToLargeTable cop | Robert Speicher | 2017-04-28 | 3 | -0/+96 |
| | | |||||
| * | Rename AddColumnWithDefault to ReversibleAddColumnWithDefault | Robert Speicher | 2017-04-28 | 3 | -4/+4 |
| | | | | | | | | | | We're going to add another cop that deals with another aspect of `add_column_with_default`, so we need to separate them. | ||||
| * | Refactor the AddColumnWithDefault cop to use node matchers | Robert Speicher | 2017-04-28 | 1 | -9/+10 |
| | | |||||
* | | Merge branch 'patch-18' into 'master' | Douwe Maan | 2017-04-30 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | Fix typo See merge request !11003 | ||||
| * | | Fix typo | Tsvi Mostovicz | 2017-04-30 | 1 | -1/+1 |
|/ / | |||||
* | | Merge branch 'revert-c3c465ac' into 'master' | Robert Speicher | 2017-04-29 | 6 | -48/+30 |
|\ \ | | | | | | | | | | | | | Revert "Merge branch 'tc-no-todo-service-select' into 'master'" See merge request !10997 | ||||
| * | | Revert "Merge branch 'tc-no-todo-service-select' into 'master'"revert-c3c465ac | Stan Hu | 2017-04-29 | 6 | -48/+30 |
|/ / | | | | | This reverts merge request !10845 | ||||
* | | Merge branch '31595-emoji-btn' into 'master' | Alfredo Sumaran | 2017-04-29 | 1 | -2/+2 |
|\ \ | | | | | | | | | | | | | | | | | | | Fix emoji alignment Closes #31595 See merge request !10993 | ||||
| * | | Fix emoji alignment31595-emoji-btn | Annabel Dunstone Gray | 2017-04-28 | 1 | -2/+2 |
| |/ | |||||
* | | Merge branch 'patch-21' into 'master' | Stan Hu | 2017-04-29 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | fix link in health check docs See merge request !10996 | ||||
| * | | fix link to MR 10416 | Ben Bodenmiller | 2017-04-29 | 1 | -1/+1 |
|/ / | |||||
* | | Merge branch 'rs-trigger-click' into 'master' | Stan Hu | 2017-04-29 | 2 | -2/+2 |
|\ \ | | | | | | | | | | | | | Change from .click -> .trigger('click') to make spec pass See merge request !10995 | ||||
| * | | 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 'docs/ldap-clarify-uid' into 'master' | Marcia Ramos | 2017-04-28 | 1 | -3/+3 |
|\ \ | |/ |/| | | | | | Update ldap.md to clarify uid should list the attribute not the value See merge request !10956 | ||||
| * | Update ldap.md to clarify uid should list the attribute not the valuedocs/ldap-clarify-uid | Lee Matos | 2017-04-27 | 1 | -3/+3 |
| | | | | | | | | [ci skip] | ||||
* | | Merge branch 'tc-no-todo-service-select' into 'master' | Robert Speicher | 2017-04-28 | 6 | -30/+48 |
|\ \ | | | | | | | | | | | | | | | | | | | 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 | 6 | -30/+48 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
* | | | Merge branch '31500-fix-rspec_profiling-reporting' into 'master' | Robert Speicher | 2017-04-28 | 4 | -11/+10 |
|\ \ \ | | | | | | | | | | | | | | | | | Resolve "rspec_profiling is enabled for MySQL" See merge request !10967 | ||||
| * | | | Resolve "rspec_profiling is enabled for MySQL" | Rémy Coutable | 2017-04-28 | 4 | -11/+10 |
|/ / / | |||||
* | | | Merge branch 'enable-spec-file-name-cop' into 'master' | Robert Speicher | 2017-04-28 | 36 | -591/+348 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Enable RSpec/FilePath cop Closes #31316 See merge request !10911 | ||||
| * | | | Enable RSpec/FilePath copenable-spec-file-name-cop | Sean McGivern | 2017-04-26 | 36 | -591/+348 |
| | | | | | | | | | | | | | | | | | | | | | | | | - 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 | 18 | -39/+26 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Pull preserve into render helpers See merge request !10986 | ||||
| * | | | | Pull preserve into render helpers | Douwe Maan | 2017-04-28 | 18 | -39/+26 |
| | | | | | |||||
* | | | | | Merge branch 'grpc-1.2.5' into 'master' | Robert Speicher | 2017-04-28 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use grpc 1.2.5 Closes #31143 and gitaly#197 See merge request !10984 | ||||
| * | | | | | Use grpc 1.2.5 | Jacob Vosmaer | 2017-04-28 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Merge branch 'dm-video-viewer' into 'master' | Sean McGivern | 2017-04-28 | 5 | -2/+24 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add video blob viewer See merge request !10749 | ||||
| * | | | | | | Display video blobs in-line like imagesdm-video-viewer | Douwe Maan | 2017-04-28 | 5 | -2/+24 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | 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 | 2 | -2/+9 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 2 | -2/+9 |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | 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 | 8 | -9/+157 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 8 | -9/+157 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'zj-accept-default-branch-param' into 'master' | Douwe Maan | 2017-04-28 | 3 | -1/+6 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Accept default branch param on notifaction services Closes #31173 See merge request !10959 | ||||
| * | | | | | | | Accept default branch param on notifaction services | Zeger-Jan van de Weg | 2017-04-28 | 3 | -1/+6 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch 'fix-sidebar-block-ref-test' into 'master' | Sean McGivern | 2017-04-28 | 2 | -5/+4 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 2 | -5/+4 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch 'pages-0.4.1' into 'master' | Kamil Trzciński | 2017-04-28 | 2 | -1/+5 |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Use GitLab Pages v0.4.1 See merge request !10891 | ||||
| * | | | | | | | Use GitLab Pages v0.4.1 | Nick Thomas | 2017-04-25 | 2 | -1/+5 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch 'grpc-fork-tests' into 'master' 24339-job-page-step-2 | Sean McGivern | 2017-04-28 | 5 | -1/+115 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 5 | -1/+106 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge branch 'docs/make-ci-run-only-for-doc-changes' into 'master' | Achilleas Pipinellis | 2017-04-28 | 2 | -0/+51 |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Skip irrelevant jobs for documentation only changes Closes #30853 See merge request !10961 |