summaryrefslogtreecommitdiff
path: root/app/models/merge_request.rb
Commit message (Expand)AuthorAgeFilesLines
* 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
|/
* Stop MR conflict code from blowing up when branches are missingdm-no-conflicts-when-branches-are-missingDouwe Maan2017-05-181-0/+2
* Merge branch 'fix-conflict-resolution-with-corrupt-repos' into 'master' Douwe Maan2017-05-121-28/+0
|\
| * Fix conflict resolution from corrupted upstreamfix-conflict-resolution-with-corrupt-reposSean McGivern2017-05-121-28/+0
* | Move update_assignee_cache_counts to the serviceValery Sizov2017-05-121-8/+0
|/
* Merge branch 'issue_27168_2' into 'master' Sean McGivern2017-05-091-6/+2
|\
| * Preloads head pipeline for each merge requestFelipe Artur2017-05-081-6/+2
* | Merge request widget redesignFatih Acet2017-05-091-1/+3
|/
* Backport of multiple_assignees_feature [ci skip]Valery Sizov2017-05-041-0/+32
* Allow commenting on older versions of the diff and comparisons between diff v...dm-link-discussion-to-outdated-diffDouwe Maan2017-05-031-6/+12
* Fix 404 when upstream has disabled merge requestsmhasbini2017-04-271-0/+7
* Show correct size when MR diff overflowsSean McGivern2017-04-251-8/+9
* Merge branch 'dm-outdated-diff-link' into 'master' Sean McGivern2017-04-111-0/+8
|\
| * Fix specs and make tweaksDouwe Maan2017-04-081-1/+1
| * Cache MR diffs by diff refsDouwe Maan2017-04-081-1/+5
| * Link to outdated diff in older MR version from outdated diff discussionDouwe Maan2017-04-081-0/+4
* | Remove an unused `cared` scope from Issue and MergeRequestrs-remove-open-for-scopeRobert Speicher2017-04-101-1/+0
|/
* Merge branch 'master' into new-resolvable-discussionLuke "Jared" Bennett2017-04-071-1/+1
|\
| * Merge branch 'master' into '18471-restrict-tag-pushes-protected-tags'Kushal Pandya2017-04-061-4/+8
| |\
| * | Moved Project#protected_branch? to ProtectedBranch, similar for tagsJames Edwards-Jones2017-04-031-1/+1
* | | Address review commentsDouwe Maan2017-04-051-24/+0
* | | Extract commonalities between DiffDiscussion and LegacyDiffDiscussionDouwe Maan2017-04-051-2/+2
* | | Add option to start a new discussion on an MRDouwe Maan2017-04-051-24/+13
| |/ |/|
* | Skip MR metrics when importing projects from GitHubDouglas Barbosa Alexandre2017-04-031-1/+0
* | Merge branch '22145-slow-search' into 'master' Yorick Peterse2017-03-241-2/+4
|\ \
| * | simplify projects, mrs search queriesmhasbini2017-03-221-2/+4
| |/
* | Revert "Merge branch '29534-todos-performance' into 'master'"Sean McGivern2017-03-211-1/+4
|/
* Todos performance: Include associations in FinderJarka Kadlecova2017-03-201-4/+1
* Include time tracking attributes in webhooks payload27271-missing-time-spent-in-issue-webhookRuben Davila2017-03-141-1/+4
* Default to subtle MR mege button until CI status is available28010-mr-merge-button-default-to-dangerEric Eastwood2017-03-021-1/+4
* Update occurrences of MWBS to MWPSfix/mwbs-to-mwpsJames Lopez2017-03-011-6/+6
* Only create unmergeable todos onceonly-create-unmergeable-todo-onceSean McGivern2017-02-241-4/+0
* Merge branch 'dm-meer-blauw-op-straat' into 'master' Robert Speicher2017-02-231-1/+1
|\
| * Revert "Enable Style/DotPosition"Douwe Maan2017-02-231-3/+3
| * Revert "Prefer leading style for Style/DotPosition"Douwe Maan2017-02-231-9/+9
| * Prefer leading style for Style/DotPositionDouwe Maan2017-02-231-9/+9
View Lorry Controller Status