summaryrefslogtreecommitdiff
path: root/spec/models/merge_request_spec.rb
Commit message (Expand)AuthorAgeFilesLines
* Collapse large diffs by defaultSean McGivern2016-07-081-0/+25
* Add tests for MergeRequest#reload_diffDouwe Maan2016-07-061-0/+40
* Rename MergeRequest methods that return commits or shas to be more clear and ...Douwe Maan2016-07-061-14/+15
* Don't garbage collect commits that have related DB records like commentsDouwe Maan2016-07-041-2/+2
* Rename ci_commit -> pipelineRémy Coutable2016-06-101-11/+11
* Rename MergeRequest#cannot_be_merged_because_build_is_not_success? to #mergea...Rémy Coutable2016-06-101-32/+37
* Improve initial implementation of the 'only_allow_merge_if_build_succeeds.rb'...Rémy Coutable2016-06-101-16/+47
* Allow or not merge MR with failed buildRui Anderson2016-06-101-0/+117
* Rename all `[ci_]commit` to `[ci_]pipeline` in specs and featuresKamil Trzcinski2016-06-031-1/+1
* Fix more places where we should rename ci_commit to pipelineKamil Trzcinski2016-06-031-6/+6
* Merge remote-tracking branch 'origin/master' into rename-ci-commitKamil Trzcinski2016-06-031-0/+17
|\
| * Update specs. Add CHANGELOG entryissue-18036Josh Frye2016-06-021-0/+17
* | Rename Ci::Commit to Ci::Pipeline and rename some of the ci_commit to pipelineKamil Trzcinski2016-06-021-2/+2
|/
* Merge branch 'separate-banzai-references' into 'master' Douwe Maan2016-06-011-0/+24
|\
| * Refactor ParticipableYorick Peterse2016-06-011-0/+24
* | Minor changes in note validation specsGrzegorz Bizon2016-05-291-2/+0
* | Update specs to carry out changes in note factoryGrzegorz Bizon2016-05-291-2/+7
|/
* Allows MR authors to have the source branch removed when merging the MRJeroen Jacobs2016-05-201-1/+6
* Preserve commits/diff/comments for PRs that were merged on GitHubDouglas Barbosa Alexandre2016-05-131-2/+13
* Remove the annotate gem and delete old annotationsJeroen van Baarsen2016-05-091-29/+0
* Fix specsKamil Trzcinski2016-04-111-2/+2
* Ensuring Merge Request API returns boolean values for work_in_progressAbhi Rao2016-03-281-4/+4
* Soft delete issuablesZeger-Jan van de Weg2016-03-191-0/+5
* Merge remote-tracking branch 'origin/master' into remove-wipRémy Coutable2016-03-181-0/+118
|\
| * Add a safeguard in MergeRequest#compute_diverged_commits_countRémy Coutable2016-03-181-0/+22
| * Merge branch 'fix-mr-source-sha' into 'master' Douwe Maan2016-03-181-0/+25
| |\
| | * Fix MergeRequest#source_sha when there is no diffPierre de La Morinerie2016-03-161-0/+7
| | * Add tests for MergeRequest#source_shaPierre de La Morinerie2016-03-161-0/+18
| * | Restrict access to references for confidential issuesDouglas Barbosa Alexandre2016-03-171-0/+1
| |/
| * Use a UNION in MergeRequest.in_projectsYorick Peterse2016-03-111-0/+6
| * Indicate how much an MR branch diverges from the target branchPierre de La Morinerie2016-03-031-0/+64
* | Improve the "easy WIP & un-WIP from link" featureRémy Coutable2016-03-181-18/+10
|/
* Save merge commit id when MR is mergedRubén Dávila2016-02-191-0/+1
* Add new data to project in push, issue, merge-request and note webhooks databugagazavr/gitlab-ce-extend-hooksKirill Zaitsev2016-02-111-6/+15
* Merge branch 'disable-remove-source-branch' into 'master' Douwe Maan2016-02-041-1/+7
|\
| * Hide remove source branch button when new commit is added to branchZeger-Jan van de Weg2016-02-041-1/+7
* | Merge branch 'wipMergeSpacing' into 'master' Douwe Maan2016-02-041-0/+5
|\ \ | |/ |/|
| * Removed redundent and incorrect tests on WIPTed Hogan2016-01-061-10/+0
| * Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into wipMergeSpacingTed Hogan2015-12-291-2/+77
| |\
| * | No space required after WIP identifierTed Hogan2015-11-231-0/+15
* | | Optimize fetching issues closed by a merge requestmerge-request-closes-issues-performanceYorick Peterse2016-02-011-15/+7
* | | Annotate modelsStan Hu2016-01-061-19/+22
| |/ |/|
* | Backport JIRA serviceDrew Blessing2015-12-181-0/+11
* | Merge branch 'master' into split-up-buildsDouwe Maan2015-12-091-1/+65
|\ \
| * \ Merge branch 'master' into merge-if-greenZeger-Jan van de Weg2015-12-071-0/+25
| |\ \ | | |/
| * | Button fixZeger-Jan van de Weg2015-12-071-1/+1
| * | Incorporate feedbackZeger-Jan van de Weg2015-12-051-8/+36
| * | Specs for 'Merge When Build Succeeds'Zeger-Jan van de Weg2015-12-021-0/+24
| * | Merge branch 'master' into merge-if-greenZeger-Jan van de Weg2015-11-181-0/+1
| |\ \
| * | | API support, incorporated feedbackZeger-Jan van de Weg2015-11-181-1/+13
View Lorry Controller Status