summaryrefslogtreecommitdiff
path: root/app/models/merge_request.rb
Commit message (Expand)AuthorAgeFilesLines
* Fix RangeError exceptions when referring to issues or merge requests outside ...Stan Hu2016-06-181-0/+4
* Merge branches 'feature/project-export' and 'feature/project-import' of gitla...James Lopez2016-06-131-49/+42
|\
| * Remove unused MergeRequest#gitlab_merge_status methodRémy Coutable2016-06-101-8/+0
| * Rename ci_commit -> pipelineRémy Coutable2016-06-101-1/+1
| * Rename MergeRequest#cannot_be_merged_because_build_is_not_success? to #mergea...Rémy Coutable2016-06-101-5/+7
| * Improve initial implementation of the 'only_allow_merge_if_build_succeeds.rb'...Rémy Coutable2016-06-101-5/+14
| * Allow or not merge MR with failed buildRui Anderson2016-06-101-1/+5
| * Merge branch 'zj-workhorse-to-serve-diffs' into 'master' 14722-searching-for-usernames-should-only-be-possible-for-search-strings-with-a-valid-formatJacob Vosmaer (GitLab)2016-06-071-7/+0
| |\
| | * Workhorse to serve raw diffsZeger-Jan van de Weg2016-06-031-7/+0
| * | Rename Ci::Commit to Ci::Pipeline and rename some of the ci_commit to pipelineKamil Trzcinski2016-06-021-2/+2
| |/
| * Allows MR authors to have the source branch removed when merging the MRJeroen Jacobs2016-05-201-1/+16
| * Preserve commits/diff/comments for PRs that were merged on GitHubDouglas Barbosa Alexandre2016-05-131-1/+9
| * Merge branch 'deprecated-class-methods-cop' into 'master' Robert Speicher2016-05-121-1/+1
| |\
| | * Enable the Rubocop DeprecatedClassMethods copConnor Shea2016-05-081-1/+1
| * | Remove the annotate gem and delete old annotationsJeroen van Baarsen2016-05-091-30/+0
| |/
* | started refactoring some stuff based on MR feedbackJames Lopez2016-06-011-4/+3
* | Merge branch 'feature/project-export' of gitlab.com:gitlab-org/gitlab-ce into...James Lopez2016-05-091-6/+7
|\ \ | |/
| * Annotate the modelsZeger-Jan van de Weg2016-05-061-6/+7
* | fix conflictsJames Lopez2016-04-211-7/+8
|\ \ | |/
| * Merge branch 'ci-commit-as-pipeline' into 'master' Kamil Trzciński2016-04-211-1/+1
| |\
| | * Merge remote-tracking branch 'origin/master' into ci-commit-as-pipelineKamil Trzcinski2016-04-131-3/+3
| | |\
| | * | Use Ci::Commit as PipelineKamil Trzcinski2016-04-111-1/+1
| * | | Verify the MR being displayed question has a merge commit set and can be cher...Douwe Maan2016-04-201-0/+4
| * | | Get rid of more requires, which causes warnings when code is reloaded15139-fix-constants-redefinition-warningsRémy Coutable2016-04-191-3/+0
| | |/ | |/|
| * | Add changelog entry, improve specs and model codeissue_15044Felipe Artur2016-04-121-9/+4
| * | Allow to close invalid merge requestFelipe Artur2016-04-111-2/+7
| |/
* | Merge branch 'feature/project-export' of gitlab.com:gitlab-org/gitlab-ce into...James Lopez2016-04-081-8/+8
|\ \ | |/
| * Merge branch 'fix_remove_fork_link' into 'master' Douwe Maan2016-04-041-0/+1
| |\
| | * Merge branch 'master' into fix_remove_fork_linkBaldinof2016-03-141-1/+18
| | |\
| | * | Close merge requests when removing fork relationBaldinof2016-03-111-0/+1
| * | | Memoize reference_pattern/link_reference_patternmemoize-pattern-methodsYorick Peterse2016-04-011-2/+2
| * | | We need `sha` reference from `diff_base_commit` to generate the diffGabriel Mazetto2016-03-291-2/+2
| * | | Use `diff_base_commit` instead of `target_branch` to generate diffsGabriel Mazetto2016-03-291-4/+4
| * | | Ensuring Merge Request API returns boolean values for work_in_progressAbhi Rao2016-03-281-1/+1
| * | | Fix group project selection in IssuableFinderDouwe Maan2016-03-201-1/+0
* | | | Merge branches 'feature/project-import' and 'master' of gitlab.com:gitlab-org...James Lopez2016-03-211-3/+16
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'origin/master' into remove-wipRémy Coutable2016-03-181-8/+66
| |\ \ \
| | * | | Add a safeguard in MergeRequest#compute_diverged_commits_countRémy Coutable2016-03-181-1/+4
| | * | | Fix MergeRequest#source_sha when there is no diffPierre de La Morinerie2016-03-161-1/+5
| | | |/ | | |/|
| * | | Improve the "easy WIP & un-WIP from link" featureRémy Coutable2016-03-181-1/+1
| * | | Use specialized system notes when MR is (un)marked as WIPDouwe Maan2016-02-261-1/+7
* | | | Merge branches 'feature/project-export' and 'feature/project-import' of gitla...James Lopez2016-03-141-3/+18
|\ \ \ \ | | |/ / | |/| |
| * | | Use a UNION in MergeRequest.in_projectsYorick Peterse2016-03-111-1/+18
| | |/ | |/|
| * | Merge branch 'issue_13621_2' into 'master' Douwe Maan2016-03-071-2/+0
| |\ \
| | * | Updates from last code review.issue_13621_2Rubén Dávila2016-03-061-1/+0
| | * | Refactor GlobalMilestone queries.Rubén Dávila2016-03-041-1/+0
* | | | don't create MR diff as this can be imported presumablyJames Lopez2016-03-141-1/+1
* | | | fixed MR issue and refactored some stuffJames Lopez2016-03-141-1/+1
* | | | fixing MR issues with importJames Lopez2016-03-111-1/+3
|/ / /
* | | Merge branch 'indicate-mr-diverged-from-target' into 'master' Douwe Maan2016-03-071-0/+23
|\ \ \
View Lorry Controller Status