summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into reference-pipeline-and-cachingreference-pipeline-and-cachingDouwe Maan2015-12-0815-18/+148
|\
| * Merge branch 'rs-validators' into 'master' Douwe Maan2015-12-085-8/+55
| |\ | | | | | | | | | | | | | | | | | | Add more custom validators These custom validators allow us to DRY up our models a bit. See merge request !1944
| | * Add custom NamespaceValidatorRobert Speicher2015-12-072-3/+19
| | |
| | * Add custom ColorValidatorRobert Speicher2015-12-072-5/+20
| | |
| | * Add custom UrlValidatorRobert Speicher2015-12-071-0/+16
| | |
| * | Merge branch 'master' into fix-merge-request-that-removes-submodulefix-merge-request-that-removes-submoduleDouglas Barbosa Alexandre2015-12-075-3/+33
| |\ \
| | * | Fix random failing test - delete attachmentfix-random-testDmitriy Zaporozhets2015-12-072-2/+14
| | |/ | | | | | | | | | | | | | | | | | | Make sure we wait for AJAX request to finish before end test and cleanup database Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * Fix spec failure introduced by 9d03bc6fa31f123e070bab4a58b67dbb008e75e9Robert Speicher2015-12-071-1/+1
| | |
| | * Merge branch 'report-ssl-errors' of https://gitlab.com/stanhu/gitlab-ceDmitriy Zaporozhets2015-12-071-0/+6
| | |\
| | | * Handle and report SSL errors in Web hook test. Check for status 200 for success.Stan Hu2015-12-041-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a Web hook test fails due to an SSL error or some other error, report the result back to the user instead of an Error 500. Closes #3656 Handle response
| | * | Merge branch 'fix-api-private-project-update' into 'master' Dmitriy Zaporozhets2015-12-071-0/+12
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix API setting of 'public' attribute to false will make a project private There is a bug in the projects API where setting `public` to `false` of would not change `visibility_level` even if `visiblity_level` were not present. Closes #3864 See merge request !1996
| | | * | Fix API setting of 'public' attribute to false will make a project privateStan Hu2015-12-051-0/+12
| | | | | | | | | | | | | | | | | | | | Closes #3864
| * | | | Merge branch 'master' into fix-merge-request-that-removes-submoduleDouglas Barbosa Alexandre2015-12-0721-218/+753
| |\ \ \ \ | | |/ / /
| | * | | Merge branch 'webhook_payload_with_changes' into 'master' Valery Sizov2015-12-072-6/+14
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add added, modified and removed properties to commit object in webhook https://gitlab.com/gitlab-org/gitlab-ee/issues/20 See merge request !1988
| | | * | | fixes after reviewwebhook_payload_with_changesValery Sizov2015-12-071-1/+1
| | | | | |
| | | * | | fox specsValery Sizov2015-12-071-1/+1
| | | | | |
| | | * | | Add added, modified and removed properties to commit object in webhookValery Sizov2015-12-042-6/+14
| | | | |/ | | | |/|
| * | | | Fix 500 error when creating a merge request that removes a submoduleDouglas Barbosa Alexandre2015-12-043-1/+46
| | |/ / | |/| |
* | | | Store the demodulized reference filter name in data attributeRobert Speicher2015-12-072-14/+14
| | | |
* | | | Merge branch 'master' into reference-pipeline-and-cachingDouwe Maan2015-12-0723-218/+778
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'fix-global-milestones-error-500' into 'master' Douwe Maan2015-12-072-3/+29
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Error 500 when creating global milestones with Unicode characters Two issues: 1. The constraints in the resources were incorrect. Here's what it was before: ``` group_milestone GET /groups/:group_id/milestones/:id(.:format) groups/milestones#show {:id=>/[a-zA-Z.0-9_\-]+(?<!\.atom)/, :group_id=>/[a-zA-Z.0-9_\-]+(?<!\.atom)/} ``` In this case, id is actually the title of the milestone, which can be anything at the moment. After: ``` group_milestone GET /groups/:group_id/milestones/:id(.:format) groups/milestones#show {:id=>/[^\/]+/, :group_id=>/[a-zA-Z.0-9_\-]+(?<!\.atom)/} ``` 2. `parameterize` would strip all Unicode characters, leaving a blank string. Rails would report something like: ``` ActionView::Template::Error (No route matches {:action=>"show", :controller=>"groups/milestones", :group_id=>#<Group id: 48, name: "ops-dev", path: "ops-dev", owner_id: nil, created_at: "2015-11-15 08:55:30", updated_at: "2015-12-02 06:23:26", type: "Group", description: "", avatar: "sha1.c71e73d51af1865c1bbbf6208e10044d46c9bb93.png", public: false>, :id=>"", :title=>"肯定不是中文的问题"} missing required keys: [:id]): ``` This change uses the babosa library to create a better slug, which surprisingly isn't actually used by the global milestone controllers. Instead, they use the title passed as a query string for some reason. Closes https://github.com/gitlabhq/gitlabhq/issues/9881 See merge request !1983
| | * | | Fix spec that broke due to fact that iid is needed, not id, for ↵Stan Hu2015-12-051-3/+2
| | | | | | | | | | | | | | | | | | | | MilestonesController
| | * | | Fix Error 500 when creating global milestones with Unicode charactersStan Hu2015-12-051-0/+27
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Two issues: 1. The constraints in the resources were incorrect. Here's what it was before: ``` group_milestone GET /groups/:group_id/milestones/:id(.:format) groups/milestones#show {:id=>/[a-zA-Z.0-9_\-]+(?<!\.atom)/, :group_id=>/[a-zA-Z.0-9_\-]+(?<!\.atom)/} ``` In this case, id is actually the title of the milestone, which can be anything at the moment. After: ``` group_milestone GET /groups/:group_id/milestones/:id(.:format) groups/milestones#show {:id=>/[^\/]+/, :group_id=>/[a-zA-Z.0-9_\-]+(?<!\.atom)/} ``` 2. `parameterize` would strip all Unicode characters, leaving a blank string. Rails would report something like: ActionView::Template::Error (No route matches {:action=>"show", :controller=>"groups/milestones", :group_id=>#<Group id: 48, name: "ops-dev", path: "ops-dev", owner_id: nil, created_at: "2015-11-15 08:55:30", updated_at: "2015-12-02 06:23:26", type: "Group", description: "", avatar: "sha1.c71e73d51af1865c1bbbf6208e10044d46c9bb93.png", public: false>, :id=>"", :title=>"肯定不是中文的问题"} missing required keys: [:id]): This change uses the babosa library to create a better slug, which surprisingly isn't actually used by the global milestone controllers. Instead, they use the title passed as a query string for some reason. Closes https://github.com/gitlabhq/gitlabhq/issues/9881 Fix constraints
| * | | Merge branch 'issue_1156'Douwe Maan2015-12-072-0/+153
| |\ \ \
| | * | | Raise the exception from #execute instead of #run_hook. #1156 #3069issue_1156Rubén Dávila2015-12-031-2/+6
| | | | |
| | * | | Call update hook from new GitHooksService class. #3069Rubén Dávila2015-12-032-7/+18
| | | | |
| | * | | Run custom Git hooks when creating or deleting branches through the UI. #1156Rubén Dávila2015-12-032-0/+138
| | | | |
| * | | | Fixed duplicated issue note email notifications.Anton Baklanov2015-12-061-3/+6
| | |/ / | |/| | | | | | | | | | Fixes #2560
| * | | Merge branch 'link-refs' into 'master' Robert Speicher2015-12-0415-206/+551
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | Recognize issue/MR/snippet/commit links as references. Fixes #3744 and #3745 See merge request !1933
| | * | Use URL helpers in specsDouwe Maan2015-12-034-17/+25
| | | |
| | * | Merge branch 'master' into link-refsDouwe Maan2015-12-034-6/+39
| | |\ \ | | | |/
| | * | Allow invalid URLs in closing patternDouwe Maan2015-12-021-0/+49
| | | |
| | * | Merge branch 'master' into link-refsDouwe Maan2015-12-0217-283/+255
| | |\ \
| | * | | Satisfy RubocopDouwe Maan2015-12-022-2/+2
| | | | |
| | * | | Add new references to markdown feature spec.Douwe Maan2015-12-012-7/+24
| | | | |
| | * | | Pick up direct links to issues/MRs as references.Douwe Maan2015-12-017-41/+145
| | | | |
| | * | | Autolink first so we don't pick up numeric anchors as issue references.Douwe Maan2015-12-016-90/+103
| | | | |
| | * | | Render commit reference using short sha, but include full sha in comment.Douwe Maan2015-12-014-10/+37
| | | | |
| | * | | Fix specsDouwe Maan2015-11-304-23/+14
| | | | |
| | * | | Recognize commit range with named refs in compare URLs.Douwe Maan2015-11-301-5/+6
| | | | |
| | * | | Recognize issue/MR/snippet/commit links as references.Douwe Maan2015-11-305-3/+158
| | | | |
| | * | | Render commit range reference with short shas, link to full shas.Douwe Maan2015-11-302-69/+49
| | | | |
| * | | | Merge branch 'extend-events-api'Dmitriy Zaporozhets2015-12-041-7/+23
| |\ \ \ \
| | * | | | Extent Event and Note APIextend-events-apiDmitriy Zaporozhets2015-12-041-7/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add note to Events API * add author section to Events API * add noteable_id and noteable_type to Notes API Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | Add API endpoint to fetch merge request commits listDmitriy Zaporozhets2015-12-041-0/+17
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Merge branch 'master' into ui/form-consistencyDouwe Maan2015-12-034-6/+39
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Use consistent casing for form field labelsDouwe Maan2015-12-021-1/+1
| | |_|/ | |/| |
* | | | Merge branch 'master' into reference-pipeline-and-cachingDouwe Maan2015-12-034-6/+39
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'deprecated_warnings' into 'master' Dmitriy Zaporozhets2015-12-031-5/+7
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Git rid of deprecated warnings after rails update https://gitlab.com/gitlab-org/gitlab-ce/issues/3798 https://gitlab.com/gitlab-org/gitlab-ce/issues/3797 See merge request !1946
| | * | | fix deprecation messages in testsValery Sizov2015-12-031-5/+7
| | |/ /
View Lorry Controller Status