summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Grapify the labels APIgrapify-labels-apiRobert Schilling2016-10-241-3/+3
|
* Fix status code expectationRémy Coutable2016-10-221-1/+1
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Fix error in generating labelssh-fix-broken-label-controllerStan Hu2016-10-221-0/+15
| | | | | | | | | Attempting to generate default set of labels would result in an error: ArgumentError: wrong number of arguments (given 1, expected 0) Closes #23649
* Merge branch 'fix-example-in-api-documentation' into 'master' Rémy Coutable2016-10-221-3/+3
|\ | | | | | | | | | | | | | | | | Fix wrong example in api/users documentation ## What does this MR do? Just a small typo fix in API docs. While greping for this typo I also found couple more places with same mistake and included them in the MR too. See merge request !7043
| * Fix wrong endpoint in api/users documentation, fix same typo in spec ↵Airat Shigapov2016-10-211-3/+3
| | | | | | | | describe blocks
* | Merge branch 'separate-sidekiq-queues' into 'master' Douwe Maan2016-10-216-0/+128
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use separate queues for all Sidekiq workers ## What does this MR do? This MR updates all workers so that they (mostly) use their own Sidekiq queues. This in turn allows us to monitor queues more accurately and in the future impose queue specific throttles, limits, etc. This is a critical part we need in 8.13, despite it being so close to release day. See https://gitlab.com/gitlab-org/gitlab-ce/issues/23370 for more information. ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/issues/23370 See merge request !7006
| * | Re-organize queues to use for Sidekiqseparate-sidekiq-queuesYorick Peterse2016-10-216-0/+128
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dumping too many jobs in the same queue (e.g. the "default" queue) is a dangerous setup. Jobs that take a long time to process can effectively block any other work from being performed given there are enough of these jobs. Furthermore it becomes harder to monitor the jobs as a single queue could contain jobs for different workers. In such a setup the only reliable way of getting counts per job is to iterate over all jobs in a queue, which is a rather time consuming process. By using separate queues for various workers we have better control over throughput, we can add weight to queues, and we can monitor queues better. Some workers still use the same queue whenever their work is related. For example, the various CI pipeline workers use the same "pipeline" queue. This commit includes a Rails migration that moves Sidekiq jobs from the old queues to the new ones. This migration also takes care of doing the inverse if ever needed. This does require downtime as otherwise new jobs could be scheduled in the old queues after this migration completes. This commit also includes an RSpec test that blacklists the use of the "default" queue and ensures cron workers use the "cronjob" queue. Fixes gitlab-org/gitlab-ce#23370
* | Merge branch 'fix-bulk-assign-issues-for-external-issues' into 'master' Sean McGivern2016-10-211-0/+12
|\ \ | | | | | | | | | | | | | | | | | | Ignore external issues when bulk assigning issues to author of merge request. Fixes #23552 See merge request !7020
| * | Ignore external issues when bulk assigning issues to author of merge request.fix-bulk-assign-issues-for-external-issuesAdam Niedzielski2016-10-201-0/+12
| | | | | | | | | | | | Fixes #23552
* | | Merge branch 'adam-fix-group-web-url' into 'master' Sean McGivern2016-10-211-0/+6
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Change "Group#web_url" to return "/groups/twitter" rather than "/twitter" Fixes #23527 See merge request !7035
| * | Change "Group#web_url" to return "/groups/twitter" rather than "/twitter".Adam Niedzielski2016-10-211-0/+6
| | | | | | | | | | | | | | | Bring back the old behaviour which was changed by 6b90ccb9. Fixes #23527.
* | | Merge branch 'fix_project_member_access_levels' into 'master' Sean McGivern2016-10-212-0/+47
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix project member access levels Migrate invalid project members (owner -> master) Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/18616 See merge request !6957
| * | | Fix project member access levelsfix_project_member_access_levelsValery Sizov2016-10-212-0/+47
| | | |
* | | | Merge branch '14192-issues-closed-by-merge-requests-using-metrics-data' into ↵Yorick Peterse2016-10-211-1/+7
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | 'master' Use MergeRequestsClosingIssues cache data on Issue#closed_by_merge_requests method See merge request !6996
| * | | Use MergeRequestsClosingIssues cache data on Issue#closed_by_merge_requests ↵14192-issues-closed-by-merge-requests-using-metrics-dataPaco Guzman2016-10-201-1/+7
| | | | | | | | | | | | | | | | method
* | | | Merge branch 'pass-namespace-gitlab-project-import' into 'master' Stan Hu2016-10-201-25/+28
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix GitLab project import when a user has access only to their default namespace ## What does this MR do? It fixes a bug when a namespace ID was not passed to `/import/gitlab_project/new` page. It occurred when a user have no choice of the namespace, so we did not render the input for namespace ID. This MR introduces a hidden input for the described case. ## Does this MR meet the acceptance criteria? - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Fixes #23507 See merge request !6995
| * | | | Test GitLab project import for a user with only their default namespace.Adam Niedzielski2016-10-201-25/+28
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Refactor the spec file: - remove hardcoded record IDs - avoid top-level let if not used in all scenarios - prefer expect { ... }.to change { ... }.from(0).to(1) over checking that there are no records at the beginning of the test
* | | | Merge branch 'zj-use-iid-deployment-refs' into 'master' Kamil Trzciński2016-10-201-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use iid deployment refs This fixes the 404, because `find_by` will return nil instead of throwing an error. See merge request !7021
| * | | | Use deployment IID when saving refsZ.J. van de Weg2016-10-201-1/+1
| | | | |
* | | | | Merge branch 'preserve-note_type-and-position' into 'master' Sean McGivern2016-10-203-15/+13
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Preserve note_type and position for notes from emails Closes #23208 See merge request !7010
| * \ \ \ \ Merge remote-tracking branch 'upstream/master' into ↵preserve-note_type-and-positionLin Jen-Shin2016-10-208-15/+169
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | preserve-note_type-and-position * upstream/master: Restrict ProjectCacheWorker jobs to one per 15 min Removed code from project members controller Make label API spec independent of order Refactoring find_commits functionality Differentiate the expire from leave event Remove pagination description from individual doc Fix a broken table in Project API doc Create project feature when project is created Simpler arguments passed to named_route on toggle_award_url helper method Fixed height of issue board blank state
| * | | | | Preserve note_type and position for notes from emailsLin Jen-Shin2016-10-203-15/+13
| | |_|/ / | |/| | | | | | | | | | | | | Closes #23208
* | | | | Merge branch 'render-hipchat-notification-descriptions' into 'master' Rémy Coutable2016-10-201-8/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Render HipChat notification descriptions as HTML instead of raw markdown ## What does this MR do? Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/1621 for issues, merge requests and comments. ## Are there points in the code the reviewer needs to double check? This MR is small enough to double check everything. ## Why was this MR needed? Because seeing raw markdown in HipChat notifications is not nice :) See merge request !6371
| * | | | | Return truncation for notification descriptions, fix minor bugs with renderingAirat Shigapov2016-10-201-6/+6
| | | | | |
| * | | | | Tests for markdown HipChat notificationsDavid Eisner2016-10-201-6/+6
| | | | | |
| * | | | | Render hipchat notification descriptions as HTML instead of raw markdownAirat Shigapov2016-10-201-10/+10
| | |/ / / | |/| | |
* | | | | Merge branch '23341-fix-viewing-mr-from-deleted-project' into 'master' Douwe Maan2016-10-202-36/+18
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a 500 error viewing an MR with a deleted source project ## What does this MR do? Allows merged MRs to be shown without any 500 errors if the source project is removed ## Are there points in the code the reviewer needs to double check? https://gitlab.com/gitlab-org/gitlab-ce/commit/31c37c6c38258684fc92e0d91119c33872e39034 fixed this for closed MRs only. I had trouble understanding the introduced helper and logic, so reverted it and keyed everything on the existence of the source project or branch directly. commits.json returns a 500 error for a closed or merged MR; the approach taken in the above MR was to hide the commits... tab, so I've run with that. For merged MRs, the commits (but not the pipeline data) are in the target project, so we *could* do better, but it's a fairly nasty intervention to make it happen. ## Why was this MR needed? Viewing merged MRs should work even if the fork they came from has been deleted or unlinked. ## Screenshots (if relevant) ![Screen_Shot_2016-10-19_at_17.56.37](/uploads/1aeadd5147b9a4ad29b946b1c7ea52cb/Screen_Shot_2016-10-19_at_17.56.37.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] API support added - Tests - [x] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #23341 See merge request !6991
| * | | | Rename forked_source_project_missing? to source_project_missing?Nick Thomas2016-10-201-4/+4
| | | | |
| * | | | Fix the merge request view when source projects or branches are removedNick Thomas2016-10-201-0/+14
| | | | |
| * | | | Revert "Add #closed_without_source_project?"Nick Thomas2016-10-201-32/+0
| |/ / / | | | | | | | | | | | | | | | | | | | | This reverts commit 31c37c6c38258684fc92e0d91119c33872e39034. See #23341
* | | | Merge branch 'project-cache-worker-lease' into 'master' Rémy Coutable2016-10-201-10/+28
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restrict ProjectCacheWorker jobs to one per 15 min ## What does this MR do? This restricts performing ProjectCacheWorker jobs to once every 15 minutes per project. The goal of this is to reduce disk load in the event of a lot of pushes happening in a short period of time. The impact is that cached data (e.g. commit count) may be updated less frequently. Furthermore it could mean that separate push payloads won't lead to e.g. READMEs being updated. Most of the cached data isn't updated very frequently, so this trade off should be worth it considering the alternative is a burning storage layer. In the future we'll have to flush caches in a smarter way. For example, refreshing the README cache could probably be done separately from the other caches with its own lease and such. See https://gitlab.com/gitlab-org/gitlab-ce/issues/23550 for more information. See merge request !7017
| * | | Restrict ProjectCacheWorker jobs to one per 15 minproject-cache-worker-leaseYorick Peterse2016-10-201-10/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures ProjectCacheWorker jobs for a given project are performed at most once per 15 minutes. This should reduce disk load a bit in cases where there are multiple pushes happening (which should schedule multiple ProjectCacheWorker jobs).
* | | | Merge branch 'fix-label-api-spec' into 'master' Douwe Maan2016-10-201-2/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Make label API spec independent of order See merge request !7013
| * | | | Make label API spec independent of orderDouwe Maan2016-10-201-2/+1
| |/ / /
* | | | Merge branch 'issue_22944' into 'master' Sean McGivern2016-10-201-3/+11
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Create project feature when project is created closes #22944 See merge request !6908
| * | | Create project feature when project is createdissue_22944Felipe Artur2016-10-191-3/+11
| |/ /
* | | Differentiate the expire from leave eventCallum Dryden2016-10-205-0/+129
|/ / | | | | | | | | | | | | | | | | | | At the moment we cannot see weather a user left a project due to their membership expiring of if they themselves opted to leave the project. This adds a new event type that allows us to make this differentiation. Note that is not really feasable to go back and reliably fix up the previous events. As a result the events for previous expire removals will remain the same however events of this nature going forward will be correctly represented.
* | Merge branch 'feature/group-level-labels' into 'master' Douwe Maan2016-10-1932-156/+874
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add group level labels ## What does this MR do? Add group level labels. ## Are there points in the code the reviewer needs to double check? * `LabelsFinder` * `Gitlab::Gfm::ReferenceRewriter` * `Banzai::Filter::LabelReferenceFilter` ## Why was this MR needed? We'll be adding more feature that allow you to do cross-project management of issues. ## Screenshots (if relevant) * Group Labels ![Group Labels](/uploads/2244c06ad68eae4fb246fb4c81bf8060/2.png) * Project Labels ![Project Labels](/uploads/c5839516d2282b51f7418d9dadbeceb4/1.png) * Expanded references for group labels when moving issue to another project ![Expanded references for group labels when moving issue to another project](/uploads/0c9ab248a8420d4978d59349ae3d42e5/3.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] API support added - Tests - [x] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? #19997 See merge request !6425
| * | Avoid touch label links that does not belongs to project when moving itfeature/group-level-labelsDouglas Barbosa Alexandre2016-10-191-12/+17
| | |
| * | Rename Labels::CreateService to Labels::FindOrCreateServiceDouglas Barbosa Alexandre2016-10-191-1/+1
| | |
| * | Update specs to cope with new label types and prioritiesJames Lopez2016-10-196-9/+51
| | | | | | | | | | | | | | | | | | Fixed all related specs and also changed the logic to handle edge cases. This includes exporting and exporting of group labels, which will get associated with the new group (if any) or they will become normal project labels otherwise. Found other issues to do with not being able to import all labels at once in the beginning of the JSON - code was much simpler when we import all labels and milestones associated to a project first, then the associations will find the already created labels instead of creating them from the associations themselves.
| * | Fix GitHub importer specDouglas Barbosa Alexandre2016-10-191-1/+1
| | |
| * | Add service to create project labelsDouglas Barbosa Alexandre2016-10-191-0/+51
| | |
| * | Recreates the label priorities when moving project to another groupDouglas Barbosa Alexandre2016-10-191-0/+10
| | |
| * | Add subject to group and projects labels which return group/projectDouglas Barbosa Alexandre2016-10-192-0/+16
| | |
| * | Abstract LabelPriority away into methods on Label modelDouglas Barbosa Alexandre2016-10-191-0/+58
| | |
| * | Fix issue board related controllers to expose label priority per projectDouglas Barbosa Alexandre2016-10-191-1/+1
| | |
| * | Fix sorting by label prioritiesDouglas Barbosa Alexandre2016-10-192-12/+29
| | |
| * | Add restriction to number of permitted priorities per project labelDouglas Barbosa Alexandre2016-10-191-1/+12
| | |
| * | Add support to group labels prioritization on project levelDouglas Barbosa Alexandre2016-10-192-5/+4
| | |