summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Grapify the commit status APIgrapify-commit-statuses-apiRobert Schilling2016-10-191-2/+2
|
* Merge branch 'feature/issues-board' into 'master' Sean McGivern2016-10-1326-156/+344
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring Issues Board ## What does this MR do? This MR aims to minimize conflicts between the CE issues board feature with EE multiple boards feature. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? To avoid a lot of conflicts with EE multiple boards feature. ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [ ] ~~[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 - [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) - [ ] 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? https://gitlab.com/gitlab-org/gitlab-ee/issues/929 https://gitlab.com/gitlab-org/gitlab-ee/issues/1084 See merge request !6727
| * Fixed JS testsPhil Hughes2016-10-114-7/+7
| |
| * Fix board relates specsDouglas Barbosa Alexandre2016-10-114-15/+12
| |
| * Add Project::BoardLimitExcedeed error classDouglas Barbosa Alexandre2016-10-111-1/+1
| |
| * Fix typo on Boards::Issues::ListService specDouglas Barbosa Alexandre2016-10-111-1/+1
| |
| * Update board specs to use board factory instead of project_with_boardDouglas Barbosa Alexandre2016-10-116-15/+15
| |
| * Refactoring service to create a new issue in a board listDouglas Barbosa Alexandre2016-10-112-12/+13
| |
| * Add Project#boards to import/export configuration fileDouglas Barbosa Alexandre2016-10-111-1/+1
| |
| * Fix rubocop offensesDouglas Barbosa Alexandre2016-10-112-12/+12
| |
| * Update endpoints to handle with board issuesDouglas Barbosa Alexandre2016-10-111-15/+38
| |
| * Update endpoints to handle with board list changesDouglas Barbosa Alexandre2016-10-111-26/+31
| |
| * Update Projects::BoardsController#show to look up for a specific boardDouglas Barbosa Alexandre2016-10-111-9/+28
| |
| * Add index action to Projects::BoardsController to return project boardsDouglas Barbosa Alexandre2016-10-113-0/+63
| |
| * Add Boards::ListService service to list project boardsDouglas Barbosa Alexandre2016-10-111-0/+37
| |
| * Removes all labels from project boards when moving and issue to doneDouglas Barbosa Alexandre2016-10-111-15/+19
| |
| * Update Boards::Issues::MoveService to move issues on a specific boardDouglas Barbosa Alexandre2016-10-111-12/+12
| |
| * Update Boards::Issues::ListService to list issues for a board listDouglas Barbosa Alexandre2016-10-111-7/+24
| |
| * Update Boards::Lists::MoveService to move lists inside a specific boardDouglas Barbosa Alexandre2016-10-111-4/+4
| |
| * Update Boards::Lists::GenerateService to generate for a specific boardDouglas Barbosa Alexandre2016-10-111-6/+6
| |
| * Update Boards::Lists::CreateService to create lists for a specific boardDouglas Barbosa Alexandre2016-10-111-7/+7
| |
| * Add Boards::Lists::ListService to list lists for a specific boardDouglas Barbosa Alexandre2016-10-111-0/+18
| |
| * Update Boards::CreateService to handle with the has_many associationDouglas Barbosa Alexandre2016-10-113-20/+15
| |
| * Restrict the number of permitted boards per project to oneDouglas Barbosa Alexandre2016-10-111-0/+9
| |
| * Allow projects to have many boardsDouglas Barbosa Alexandre2016-10-111-1/+1
| |
* | Merge branch ↵Rémy Coutable2016-10-131-0/+12
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '23234-deleting-a-milestone-removes-source-branch-deletion-options-of-associated-merge-requests' into 'master' Maintain "force_remove_source_branch" options on Merge Request unless specified ## What does this MR do? Fixes a problem where Merge Requests were losing the state associated with the flag to remove the source branch upon merge * Closes #23234 * Closes #23191 * Closes #19351 See merge request !6817
| * | Maintain "force_remove_source_branch" options on Merge Request unless specifiedMark Fletcher2016-10-131-0/+12
| | |
* | | Merge branch 'feature/cycle-analytics-2-backend' into 'master' Douwe Maan2016-10-135-40/+62
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement second iteration of cycle analytics - Change in data measurement Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/22458 Measure everything that happened in the given time range, not only what's been pushed to production. With the exception of the staging and production stages. - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - 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) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !6798
| * | | fixed newlineJames Lopez2016-10-121-1/+0
| | | |
| * | | Ignore deployment for statistics in Cycle Analytics, except in staging and ↵James Lopez2016-10-125-39/+62
| | | | | | | | | | | | | | | | | | | | | | | | production stages Also, updated specs and docs.
* | | | Merge branch 'feature/improve-mrwbs-and-todos-for-pipelines' into 'master' Kamil Trzciński2016-10-135-69/+109
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Trigger Merge When Pipeline Succeeds on pipeline event ## What does this MR do? This MR is meant to improve merge when build succeeds triggers, which has an impact on performance. - [x] Move Merge When Build Succeeds trigger from commit status to pipeline event - [x] Drop support for triggering event for branches that include commit status submitted without branch (no longer relevant) - [x] Perform Merge When Pipeline Succeeds asynchronously to improve performance and avoid race conditions - [x] Add missing feature test that verifies if MWBS feature actually works and merges merge requests - [x] Update the documentation to reflect change in the behavior Moved to separate merge request: - [ ] Rename Merge When Build Succeeds to Merge When Pipeline Succeeds - [ ] Update documentation to reflect name change for this feature ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] Added for this feature/bug - [x] All builds are passing See merge request !6675
| * | | Merge branch 'master' into feature/improve-mrwbs-and-todos-for-pipelinesfeature/improve-mrwbs-and-todos-for-pipelinesGrzegorz Bizon2016-10-1221-226/+347
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Update health_check gem to `~> 2.2.0` API: Version information Revert "Merge branch 'tests-use-tmpfs' into 'master'" Added documentation chapter for Git attributes Use activerecord_sane_schema_dumper Add a separate stage for bundle check Add a bundle check step to ensure dependencies are correct Create a new /templates API namespace Add disabled delete button to protected branches Make spec deterministic refactors tests because of gitlab-test repository changes Addresses Robert's feedback Speed up specs for GET /projects/:id/events API: New /users/:id/events endpoint writes tests to verify the issue is solved and fixes breaking issues. removes inconsistency regarding tagging immediately as merged once you create a branch using new branch button and adds changelog entry
| * | | | Improve desc for pipeline integration spec in MWBSGrzegorz Bizon2016-10-121-17/+19
| | | | |
| * | | | Merge branch 'master' into feature/improve-mrwbs-and-todos-for-pipelinesGrzegorz Bizon2016-10-1276-408/+2242
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (221 commits) Add CHANGELOG entry for 8.12.6 Added 'Download' button to snippet view Merge branch 'api-fix-project-group-sharing' into 'security' Add 8.12.5, 8.11.9, and 8.10.12 CHANGELOG entries FIx JS bug with select2 because of missing `data-field` attribute in select box. Remove pointless `.vagrant_enabled` file allow multiple labels commands Move some CHANGELOG entries to the 8.13.0 part Move operations/ to new location Move health check docs under user/admin_area/monitoring Make guests unable to view MRs Add examples of fake tokens to be used in docs Remove duplicate CHANGELOG entry Allow browsing branches that end with '.atom' Refactor the SubGit/SVN documentation Document the new CI_DEBUG_TRACE variable Remove redundant images changed the scss for the top line connectors to be exactly centered Rearrange GitLab basics READMEs New images for GitLab basics "Create MR" docs ... Conflicts: app/models/commit_status.rb
| * | | | | Add test that checks actual merge for MWBS featureGrzegorz Bizon2016-10-071-2/+13
| | | | | |
| * | | | | Improve merge when builds succeeds specs readabilityGrzegorz Bizon2016-10-071-16/+28
| | | | | |
| * | | | | Process MWBS in successful pipeline asynchronouslyGrzegorz Bizon2016-10-071-0/+24
| | | | | |
| * | | | | Rename pipeline workers to match current conventionGrzegorz Bizon2016-10-062-2/+2
| | | | | |
| * | | | | Remove support for branch-less builds in MWBSGrzegorz Bizon2016-10-061-12/+1
| | | | | | | | | | | | | | | | | | | | | | | | See !6675#note_16580143
| * | | | | Fix tests and code for MWBS event move to pipelineGrzegorz Bizon2016-10-061-23/+25
| | | | | |
* | | | | | Merge branch 'fix-some-specs' into 'master' Rémy Coutable2016-10-132-4/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve appearance_spec and deploy_key_spec In appearance_spec.rb we can use build instead create record in db. In deploy_key_spec.rb we can remove unused code. See merge request !6819
| * | | | | | Use build instead create record in appearance_specSemyon Pupkov2016-10-121-1/+1
| | | | | | |
| * | | | | | Remove unused lets from deploy_key specSemyon Pupkov2016-10-121-3/+0
| | | | | | |
* | | | | | | Merge branch 'refactor-event-spec' into 'master' Rémy Coutable2016-10-131-49/+61
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Union examples in event spec for speed up ## What does this MR do? Increase tests speed for event model. ## Why was this MR needed? This change saves about 15-18 seconds. See merge request !6821
| * | | | | | | Union examples in event spec fo speed upSemyon Pupkov2016-10-131-49/+61
| |/ / / / / /
* | | | | | | Merge branch 'dz-improve-mr-compar' into 'master' Douwe Maan2016-10-122-15/+52
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve merge request versions compare logic ## What does this MR do? Changes the way how we compare between for merge request versions ## Are there points in the code the reviewer needs to double check? no ## Why was this MR needed? So when I squash+rebase my commit I can get more accurate diff on what changed between versions ## Screenshots (if relevant) in discussion (below) ## 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)~~ - [ ] ~~API support added~~ - 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 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? https://gitlab.com/gitlab-org/gitlab-ce/issues/22368, https://gitlab.com/gitlab-org/gitlab-ce/issues/22721 See merge request !6589
| * | | | | | Refactor straight compare diff codeDmitriy Zaporozhets2016-10-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | Better tests for MergeRequestDiff#compare_with methodDmitriy Zaporozhets2016-10-121-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | Improve tests for merge request diff modelDmitriy Zaporozhets2016-10-121-15/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | Add spec for compare serviceDmitriy Zaporozhets2016-10-121-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
View Lorry Controller Status