summaryrefslogtreecommitdiff
path: root/spec/models/merge_request_spec.rb
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dm-diff-cleanup' into 'master'Robert Speicher2017-05-251-3/+3
|\
| * Pass fallback_diff_refs to Diff::File instead of using view helpersDouwe Maan2017-05-231-3/+3
* | Add system note with link to diff comparison when MR discussion becomes outdatedDouwe Maan2017-05-231-2/+34
|/
* Add transient head_pipeline_of to pipeline factoriesissue_32225Felipe Artur2017-05-221-5/+3
* Merge branch 'fix-conflict-resolution-with-corrupt-repos' into 'master' Douwe Maan2017-05-121-65/+0
|\
| * Fix conflict resolution from corrupted upstreamfix-conflict-resolution-with-corrupt-reposSean McGivern2017-05-121-65/+0
* | Move update_assignee_cache_counts to the serviceValery Sizov2017-05-121-42/+0
|/
* Small code improvements and add migration specFelipe Artur2017-05-081-2/+1
* Fix specs 2Felipe Artur2017-05-081-1/+3
* Fix SpecsFelipe Artur2017-05-081-9/+7
* Backport of multiple_assignees_feature [ci skip]Valery Sizov2017-05-041-10/+81
* Allow commenting on older versions of the diff and comparisons between diff v...dm-link-discussion-to-outdated-diffDouwe Maan2017-05-031-0/+19
* Show correct size when MR diff overflowsSean McGivern2017-04-251-7/+25
* Remove helpers assigned_issuables_count and cached_assigned_issuables_countuassign_on_member_removingValery Sizov2017-04-201-4/+6
* Merge branch 'master' into new-resolvable-discussionLuke "Jared" Bennett2017-04-071-1/+1
|\
| * Moved Project#protected_branch? to ProtectedBranch, similar for tagsJames Edwards-Jones2017-04-031-1/+1
* | Address review commentsDouwe Maan2017-04-051-176/+0
* | Add specsDouwe Maan2017-04-051-7/+3
* | Fix some specsDouwe Maan2017-04-051-10/+10
* | Add option to start a new discussion on an MRDouwe Maan2017-04-051-32/+36
|/
* Include time tracking attributes in webhooks payload27271-missing-time-spent-in-issue-webhookRuben Davila2017-03-141-1/+5
* Fix issues mentioned but not closed for JIRASean McGivern2017-03-061-0/+17
* Update occurrences of MWBS to MWPSfix/mwbs-to-mwpsJames Lopez2017-03-011-11/+11
* Only create unmergeable todos onceonly-create-unmergeable-todo-onceSean McGivern2017-02-241-6/+0
* Fix MR changes tab size countfix-mr-size-with-over-100-filesSean McGivern2017-02-231-0/+44
* Merge branch 'restore-issues_mentioned_but_not_closing' into 'master'Sean McGivern2017-02-081-3/+3
|\
| * Remove MergeRequest#closes_issue?; Remove the default parameter value for #ca...Dongqing Hu2017-01-311-3/+3
* | Address feedbackDouwe Maan2017-02-061-5/+11
* | Improve performance of finding last deployed environmentDouwe Maan2017-02-061-24/+0
* | Add testsDouwe Maan2017-02-061-0/+24
* | Convert most MergeRequest model specs to use `:empty_project`Robert Speicher2017-01-191-22/+22
* | Merge branch '23524-notify-automerge-user-of-failed-build' into 'master' Sean McGivern2017-01-191-1/+9
|\ \ | |/ |/|
| * Notify the user who set auto-merge when merge conflict occurstwonegatives2017-01-141-1/+9
* | Address MR commentsJarka Kadlecova2017-01-131-0/+6
* | support `/merge` slash comand for MRsJarka Kadlecova2017-01-111-0/+96
* | Fix cross-project references copy to include the project referencefix/cross-project-ref-pathJames Lopez2017-01-031-0/+4
* | use MergeRequest#closes_issues instead of rewriting code to retrieve closing ...Gabriel Gizotti2016-12-281-3/+7
* | Change closes issues reference text on MergeRequest#merge_commit_message to m...Gabriel Gizotti2016-12-161-3/+3
* | Show either description or closes issues references on MergeRequest#merge_com...Gabriel Gizotti2016-12-161-1/+1
* | backend completely drives creation of merge commit messageGabriel Gizotti2016-12-161-0/+14
* | describe #closes_issues and describe # #issues_mentioned_but_not_closing on m...Gabriel Gizotti2016-12-161-24/+14
* | only look for issues mentioned on description on MergeRequest#issues_mentione...Gabriel Gizotti2016-12-161-1/+1
* | introduce MergeRequest#issues_mentioned_but_not_closingGabriel Gizotti2016-12-161-15/+30
* | Remove whole description from #merge_commit_message and add add closed issuesGabriel Gizotti2016-12-161-4/+10
|/
* Merge branch 'jej-note-search-uses-finder' into 'security' Douwe Maan2016-12-151-3/+3
* Merge branch '23589-open-issue-for-mr' into 'master' Sean McGivern2016-12-061-0/+40
|\
| * Feature: delegate all open discussions to IssueBob Van Landuyt2016-12-051-0/+40
* | Merge branch 'glm-shorthand-reference' into 'master' Sean McGivern2016-12-061-3/+6
|\ \ | |/ |/|
| * Add shorthand support to gitlab markdown referencesOswaldo Ferreira2016-12-021-3/+6
* | Merge branch 'fix/rename-mwbs-to-merge-when-pipeline-succeeds' into 'master' Kamil TrzciƄski2016-12-051-1/+1
|\ \ | |/ |/|