summaryrefslogtreecommitdiff
path: root/spec/requests/api/merge_requests_spec.rb
Commit message (Collapse)AuthorAgeFilesLines
* Replace many :project with :empty_projects in API specsuse-empty_project-factory-in-api-specsRémy Coutable2017-01-171-2/+2
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Don't allow blank MR titles in APIapi-dont-allow-blank-mr-titlesRobert Schilling2016-12-131-0/+16
|
* Merge branch 'api-remove-source-branch' into 'master' Rémy Coutable2016-12-091-1/+11
|\ | | | | | | | | | | | | API: Ability to remove source branch Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/23577 See merge request !7804
| * API: Ability to remove source branchapi-remove-source-branchRobert Schilling2016-12-041-1/+11
| |
* | Merge branch 'fix/rename-mwbs-to-merge-when-pipeline-succeeds' into 'master' Kamil Trzciński2016-12-051-1/+1
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename MWBS service to Merge When Pipeline Succeeds ## What does this MR do? This MR renames Merge When Build Succeeds feature to Merge When Pipeline Succeeds, because we recently changed the behavior, see https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6675. ## 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] All builds are passing ## What are the relevant issue numbers? Closes #23354 See merge request !7135
| * Fix Rubocop offense in merge request specsfix/rename-mwbs-to-merge-when-pipeline-succeedsGrzegorz Bizon2016-11-301-1/+0
| |
| * Merge branch 'master' into fix/rename-mwbs-to-merge-when-pipeline-succeedsGrzegorz Bizon2016-11-301-14/+16
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (110 commits) Rewrite an HTTP link to use HTTPS Edit /spec/features/profiles/preferences_spec.rb to match changes in 084d90ac Add blue back to sub nav active Remove JSX/React eslint plugins. Fix a transient spec failure Adds hoverstates for collapsed Issue/Merge Request sidebar Moved groups above projects Add StackProf to the Gemfile, along with a utility to get a profile for a spec Update Sidekiq-cron to fix compatibility issues with Sidekiq 4.2.1 Add a CHANGELOG entry Alert user when logged in user email is not the same as the invitation Expose timestamp in build entity used by serializer Rename `MergeRequest#pipeline` to `head_pipeline` Remove unnecessary database indexes CE-specific changes gitlab-org/gitlab-ee#1137 Fixing typo & Clarifying Key name fix started_at check fix blob controller spec failure - updated not to use file-path- fix blob controller spec failure Merge branch 'jej-use-issuable-finder-instead-of-access-check' into 'security' ... Conflicts: app/controllers/projects/merge_requests_controller.rb lib/api/merge_requests.rb spec/requests/api/merge_requests_spec.rb
| * \ Merge branch 'master' into fix/rename-mwbs-to-merge-when-pipeline-succeedsGrzegorz Bizon2016-11-251-0/+10
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (312 commits) Fix bad selection on dropdown menu for tags filter Fixed issue boards scrolling with a lot of lists & issues You can only assign default_branch when editing a project ... Don't convert data which already is the target type Stop supporting Google and Azure as backup strategies renames some of the specs and adds changelog entry Fixed dragging issue moving wrong issue after multiple drags of issue Fixed issue boards issue sorting when dragging issue into list Rephrase some system notes to be compatible with new system note style Add missing JIRA file that redirects to the new location Fix documentation to create the `pg_trm` extension before creating the DB Document that we always use `do...end` for `before` in RSpec Backport Note#commands_changes from EE Log mv_namespace parameters Add default_branch attr to Project API payload in docs. Fix title case to sentence case properly escape username validation error message flash Remove header ids from University docs Add missing documentation. Added test that checks the correct select box is there for the LFS ... ... Conflicts: app/services/system_note_service.rb spec/features/merge_requests/merge_when_pipeline_succeeds_spec.rb spec/services/merge_requests/merge_when_pipeline_succeeds_service_spec.rb spec/services/system_note_service_spec.rb
| * | | Update some docs to reflect MWPS name changeGrzegorz Bizon2016-11-211-1/+1
| | | |
* | | | Merge branch 'update-api-spec-files' into 'master' Rémy Coutable2016-12-021-1/+1
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | Update API spec files to describe the correct class by changing `API::API` to the corresponding class, for example `API::AwardEmoji`. Closes #24902 See merge request !7718
| * | | Changed API spec files to describe the correct classLivier2016-11-281-1/+1
| | |/ | |/| | | | | | | | | | | | | | | | | | | Restore changes for api spec files Fix error in rspec Users Delete extra space Repositories-spec
* | | Rename `MergeRequest#pipeline` to `head_pipeline`fix/rename-merge-request-head-pipelineGrzegorz Bizon2016-11-291-1/+1
| | |
* | | Merge branch 'zj-fix-label-creation-non-members' into 'security'Douwe Maan2016-11-281-13/+14
|/ / | | | | | | | | | | | | | | Fix label creation non members Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/23416 See merge request !2006
* | Fix IID filter for merge requests and milestonesRobert Schilling2016-11-221-0/+10
|/
* Grapify the merge request APIgrapify-merge-request-apiRobert Schilling2016-11-151-6/+0
|
* Make specs a bit fasterspec_optimizationValery Sizov2016-11-011-8/+8
|
* Allow Member.add_user to handle access requestersRémy Coutable2016-09-281-2/+2
| | | | | | | | | | | | | | | | | | | | | Changes include: - Ensure Member.add_user is not called directly when not necessary - New GroupMember.add_users_to_group to have the same abstraction level as for Project - Refactor Member.add_user to take a source instead of an array of members - Fix Rubocop offenses - Always use Project#add_user instead of project.team.add_user - Factorize users addition as members in Member.add_users_to_source - Make access_level a keyword argument in GroupMember.add_users_to_group and ProjectMember.add_users_to_projects - Destroy any requester before adding them as a member - Improve the way we handle access requesters in Member.add_user Instead of removing the requester and creating a new member, we now simply accepts their access request. This way, they will receive a "access request granted" email. - Fix error that was previously silently ignored - Stop raising when access level is invalid in Member, let Rails validation do their work Signed-off-by: Rémy Coutable <remy@rymai.me>
* entities: expose {,merge_commit_}sha in MergeRequestBen Boeckel2016-08-311-1/+8
| | | | Fixes #20456.
* api: expose web_url for project entitiesBen Boeckel2016-08-241-0/+1
| | | | | This allows web hooks to have a URL back to entities without having to generate it themselves.
* adds second batch of tests changed to active tenseactive-tense-test-coveragetiagonbotelho2016-08-091-44/+44
|
* api: expose {should,force}_remove_source_branchBen Boeckel2016-07-111-0/+4
| | | | | Workflows which use a bot to merge should remove branches if requested. Expose the flag so that bots can request know this.
* Rename MergeRequest methods that return commits or shas to be more clear and ↵Douwe Maan2016-07-061-2/+2
| | | | consistent
* Allow '?', or '&' for label titlesDouglas Barbosa Alexandre2016-07-051-10/+16
|
* Use HTTP matchers if possibleZ.J. van de Weg2016-06-271-63/+63
|
* Fix Error 500 when using closes_issues API with an external issue trackerStan Hu2016-06-111-0/+15
| | | | Closes #18484
* Rename MergeRequest#cannot_be_merged_because_build_is_not_success? to ↵Rémy Coutable2016-06-101-1/+1
| | | | | | | | #mergeable_ci_state? The logic of the method was obviously inverted. Signed-off-by: Rémy Coutable <remy@rymai.me>
* Improve initial implementation of the ↵Rémy Coutable2016-06-101-2/+3
| | | | | | | | 'only_allow_merge_if_build_succeeds.rb' feature Based on the feedback from reviewers. Signed-off-by: Rémy Coutable <remy@rymai.me>
* Allow or not merge MR with failed buildRui Anderson2016-06-101-0/+8
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch 'rename-ci-commit' into rename-ci-commit-phase-2Kamil Trzcinski2016-06-061-1/+0
|\ | | | | | | | | | | # Conflicts: # features/steps/shared/builds.rb # spec/requests/ci/api/builds_spec.rb
| * Merge remote-tracking branch 'origin/master' into rename-ci-commitKamil Trzcinski2016-06-061-1/+0
| |\
| | * Merge branch 'master' into awardablesawardablesZ.J. van de Weg2016-06-031-0/+13
| | |\
| | * | Incorporate feedbackZeger-Jan van de Weg2016-05-111-1/+0
| | | |
| * | | Fix tests offenses: use `pipeline` of Ci::Build and rename viewsKamil Trzcinski2016-06-061-1/+1
| | | |
* | | | Rename all `[ci_]commit` to `[ci_]pipeline` in specs and featuresKamil Trzcinski2016-06-031-2/+2
|/ / /
* | | Merge commit 'ca3c5c295ed653b483fe81c3918ffe60f46666b9' into rename-ci-commitKamil Trzcinski2016-06-031-0/+13
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ca3c5c295ed653b483fe81c3918ffe60f46666b9': Let contributors know where to start Ensure branch cleanup regardless of whether the import process succeeds Fix failing todo tests Reorder the todos because the use of the project finder attempts to order them differently Update target todo test to use a public project Use the project finder in the todos finder to limit todos to just ones within projects you have access to. Move filtering todos by projects not pending deletion into a scope on the todo model Reduce the filters on the todos joins project query by being explicit about the join Ensure we don't show TODOS for projects pending delete Fix deprecation warnings in spec/services/issues/bulk_update_service_spec.rb Remove unused Issuable#is_assigned? method fixup! Don't allow merges with new commits fixup! Add `sha` parameter to MR accept API Reduce Namespace queries in UserReferenceFilter Added ReferenceFilter#nodes Returning enums in ReferenceFilter#each_node Don't allow merges with new commits Add `sha` parameter to MR accept API
| * | Add `sha` parameter to MR accept APISean McGivern2016-06-011-0/+13
| |/ | | | | | | | | | | | | | | | | The `sha` parameter is optional, and when present, must match the current HEAD SHA of the source branch. Otherwise, the API call fails with a 409 Conflict and a message containing the current HEAD for the source branch. Also tidy up some doc wording.
* | Rename Ci::Commit to Ci::Pipeline and rename some of the ci_commit to pipelineKamil Trzcinski2016-06-021-2/+2
|/
* Expose MergeRequest#user_notes_count in the API and use the method in issues ↵Rémy Coutable2016-05-091-0/+28
| | | | | | list Signed-off-by: Rémy Coutable <remy@rymai.me>
* Ensure that issues and merge requests are foundRobert Schilling2016-04-131-0/+12
|
* Make subscription API more RESTfulRobert Schilling2016-04-131-7/+7
|
* API: Ability to subscribe and unsubscribe from a merge requestRobert Schilling2016-04-131-0/+30
|
* Ensuring Merge Request API returns boolean values for work_in_progressAbhi Rao2016-03-281-0/+11
| | | | Fixes #14692
* Fix typos and dentingZeger-Jan van de Weg2016-03-211-7/+7
|
* Minor improvements on IssuableActionsZeger-Jan van de Weg2016-03-211-13/+16
|
* minor improvements and fixed specsZeger-Jan van de Weg2016-03-191-9/+13
|
* Soft delete issuablesZeger-Jan van de Weg2016-03-191-0/+18
|
* Merge branch 'skakirill/gitlab-ce-api-merge-request-setup-milestone' into ↵Douwe Maan2016-02-121-3/+12
|\ | | | | | | | | | | | | | | | | | | | | | | | | 'master' API: Allow to set or update a merge-request's milestone _Originally opened at !2107 by @ skakirill._ - - - See merge request !2755
| * Add a spec for setting/updating a MR's milestone via the APIskakirill/gitlab-ce-api-merge-request-setup-milestoneRémy Coutable2016-02-091-3/+12
| |
* | Merge branch 'Schniz/gitlab-ce-feature/merge-request-closes-issues-in-api' ↵Rémy Coutable2016-02-111-0/+22
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Add merge_requests/:merge_request_id/closes_issues _Originally opened at !2660 by @Schniz._ - - - Added `/api/v3/projects/:id/merge_requests/:merge_request_id/closes_issues` route in the API for getting the issues that should be closed when a merge request merged successfully See merge request !2779
| * | Pass current_user to merge_request.closes_issues in API ans streamline MR ↵Schniz/gitlab-ce-feature/merge-request-closes-issues-in-apiRémy Coutable2016-02-111-12/+8
| | | | | | | | | | | | API specs
View Lorry Controller Status