summaryrefslogtreecommitdiff
path: root/app/models/merge_request.rb
Commit message (Expand)AuthorAgeFilesLines
* Revert "Revert "Merge branch '18193-developers-can-merge' into 'master' ""Rémy Coutable2016-07-181-1/+7
* Revert "Merge branch '18193-developers-can-merge' into 'master' "Robert Speicher2016-07-131-7/+1
* Don't ask the user to "merge this request manually".Timothy Andrew2016-07-131-0/+5
* Refactor `Gitlab::GitAccess`Timothy Andrew2016-07-131-1/+1
* Added "developers can merge" setting to protected branchesMathias Vestergaard2016-07-131-1/+2
* Merge branch 'master' into single-file-diffsSean McGivern2016-07-111-2/+2
|\
| * Memoize MR merged/closed events retrievalmemoize_merge_request_eventsPaco Guzman2016-07-081-2/+2
* | Collapse large diffs by defaultSean McGivern2016-07-081-1/+5
|/
* Remove duplication, unused methods, and some other style thingsDouwe Maan2016-07-061-5/+1
* Add some more code comments.Douwe Maan2016-07-061-2/+3
* Automatically update diff note positions when MR is pushed toDouwe Maan2016-07-061-5/+40
* Support new diff notes on MRs with diff_refsDouwe Maan2016-07-061-0/+4
* Add Timeless helper module to prevent updated_at from being updatedDouwe Maan2016-07-061-6/+1
* Represent DiffRefs as proper class instead of tuple arrayDouwe Maan2016-07-061-6/+10
* Rename MergeRequest methods that return commits or shas to be more clear and ...Douwe Maan2016-07-061-40/+80
* Revert back to not defining a default Git access protocol.Patricio Cano2016-07-051-1/+1
* Default Git access protocol to `web`Patricio Cano2016-07-051-1/+1
* Rename ENV['PROTOCOL'] to ENV['GL_PROTOCOL'] to conform to what GitLab Shell ...Patricio Cano2016-07-051-1/+1
* Don't garbage collect commits that have related DB records like commentsDouwe Maan2016-07-041-3/+9
* use has_many relationship with eventsJames Lopez2016-07-011-1/+2
* fixing events for import/exportJames Lopez2016-06-291-0/+1
* Workhorse to serve email diffsZ.J. van de Weg2016-06-281-7/+0
* Fix a wrong MR status when merge_when_build_succeeds & project.only_allow_mer...19035-fix-merge-issueRémy Coutable2016-06-241-4/+4
* 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
|\ \ | |/
View Lorry Controller Status