summaryrefslogtreecommitdiff
path: root/app/models/merge_request.rb
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'issue_36820' into 'master'Sean McGivern2017-09-011-0/+2
|\
| * Remove closing external issues by reference errorissue_36820Felipe Artur2017-08-311-0/+2
* | Merge branch 'sidebar-cache-updates' into 'master'Sean McGivern2017-08-311-0/+6
|\ \
| * | Only update the sidebar count caches when neededsidebar-cache-updatesYorick Peterse2017-08-301-0/+6
| |/
* | Merge remote-tracking branch 'upstream/master' into 36807-gc-unwanted-refs-af...Lin Jen-Shin2017-08-301-6/+16
|\ \ | |/
| * Rename MergeRequest#async_merge to merge_asyncOswaldo Ferreira2017-08-281-1/+1
| * Add changelogOswaldo Ferreira2017-08-281-1/+1
| * Track enqueued and ongoing MRsOswaldo Ferreira2017-08-281-3/+9
| * Remove locked? check when unlocking a merge requestOswaldo Ferreira2017-08-281-1/+1
| * Merge branch '36262_merge_request_reference_in_merge_commit_global' into 'mas...Sean McGivern2017-08-241-2/+1
| |\
| | * [ci skip] changelog entry added for full merge request ref changeshaseeb2017-08-231-1/+0
| | * fix Merge request reference in merge commit is not globalhaseeb2017-08-131-2/+2
| * | Merge branch 'cache-issue-and-mr-counts' into 'master'Douwe Maan2017-08-231-0/+5
| |\ \
| | * | Cache the number of open issues and merge requestsYorick Peterse2017-08-231-0/+5
* | | | Try to make reserved ref names more obviousLin Jen-Shin2017-08-251-1/+1
|/ / /
* | | Remove ignore columnsFelipe Artur2017-08-181-1/+0
|/ /
* | Use with_repo_branch_commit instead of fetch_ref directlyLin Jen-Shin2017-08-141-9/+8
* | Don't try to create diffs if one of the branch is missingLin Jen-Shin2017-08-101-1/+2
* | Introduce MergeRequest#write_ref and Repository#write_refLin Jen-Shin2017-08-101-5/+15
|/
* Re-enable SqlInjection and CommandInjectionBrian Neel2017-08-081-1/+1
* Move locked_at removal to post-deployment migrationOswaldo Ferreira2017-08-071-0/+1
* Store MergeWorker JID on merge request, and clean up stuck mergesOswaldo Ferreira2017-08-071-16/+6
* Rename many path_with_namespace -> full_pathGabriel Mazetto2017-08-011-2/+2
* Merge issuable "reopened" state into "opened"merge-issuable-reopened-into-opened-stateYorick Peterse2017-07-281-7/+6
* Support both internal and external issue trackersJarka Kadlecova2017-07-241-1/+1
* Make sure MergeRequest commit methods work when either compare_commits or mer...dm-merge-request-creation-errorDouwe Maan2017-07-131-6/+31
* Merge branch 'sh-optimize-mr-api' into 'master'Stan Hu2017-07-081-1/+1
|\
| * Remove many N+1 queries with merge requests APIsh-optimize-mr-apiStan Hu2017-07-071-1/+1
* | Merge branch 'feature/user-datetime-search-api-mysql' into 'master'Douwe Maan2017-07-071-0/+1
|\ \ | |/ |/|
| * fix specJames Lopez2017-07-071-0/+1
* | Speed up `all_commit_shas` for new merge requestsSean McGivern2017-07-071-1/+4
|/
* Add table for merge request commitsSean McGivern2017-07-061-5/+5
* Rename ActiverecordSerialize copYorick Peterse2017-07-061-1/+1
* Added Cop to blacklist the use of `dependent:`Yorick Peterse2017-07-061-2/+4
* Add many foreign keys to the projects tableYorick Peterse2017-07-061-2/+2
* Merge branch 'tc-namespace-license-checks--multiple-assignees' into 'master'Douwe Maan2017-07-041-1/+9
|\
| * Make MergeRequest respond to assignee_ids & assignee_ids=Toon Claes2017-06-201-1/+9
* | Store merge request ref_fetched status in the database34052-store-mr-ref-fetched-in-databaseAdam Niedzielski2017-06-261-1/+8
* | Enable Style/DotPosition Rubocop :cop:Grzegorz Bizon2017-06-211-2/+2
|/
* Merge branch '27070-rename-slash-commands-to-quick-actions' into 'master'Sean McGivern2017-06-161-1/+1
|\
| * Rename "Slash commands" to "Quick actions"Eric Eastwood2017-06-151-1/+1
* | Migration - Remove position field from issues and merge requestsFelipe Artur2017-06-161-0/+3
|/
* Merge branch 'dm-update-discussion-diff-position' into 'master'Grzegorz Bizon2017-06-011-13/+9
|\
| * Update diff discussion position per discussion instead of per notedm-update-discussion-diff-positionDouwe Maan2017-05-311-13/+9
* | Merge branch 'document-not-using-serialize' into 'master'Douwe Maan2017-06-011-1/+1
|\ \
| * | Added Cop to blacklist the use of serializedocument-not-using-serializeYorick Peterse2017-05-311-1/+1
| |/
* | Consistent diff and blob size limit namesDouwe Maan2017-05-291-2/+2
|/
* Merge branch 'dm-diff-cleanup' into 'master'Robert Speicher2017-05-251-27/+7
|\
| * Pass fallback_diff_refs to Diff::File instead of using view helpersDouwe Maan2017-05-231-27/+7
* | Add system note with link to diff comparison when MR discussion becomes outdatedDouwe Maan2017-05-231-4/+16
|/
View Lorry Controller Status