delta/gitlab/gitlab-ce.git/spec/models/merge_request_diff_spec.rb, branch patch-9 gitlab.com: gitlab-org/gitlab-ce.git Replace references to MergeRequestDiff#commits with st_commits 2016-12-01T11:17:30+00:00 Adam Niedzielski adamsunday@gmail.com 2016-12-01T11:17:30+00:00 cb6f8cdfc23a18daf33288c95ae8badec63f53ad when we care only about the number of commits We do not have to instantiate all objects in this case. 
when we care only about the number of commits

We do not have to instantiate all objects in this case.
Better tests for MergeRequestDiff#compare_with method 2016-10-12T13:32:57+00:00 Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com 2016-09-29T15:02:06+00:00 7421c08ace8a129b37c4942eb21a0b5cf1a73a53 Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Improve tests for merge request diff model 2016-10-12T13:32:57+00:00 Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com 2016-09-29T14:46:47+00:00 cdcc11d48fe6d04f6a1cfebc39bcea71d35b3e4a Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Merge branch '20708-new-branch-is-immediatelly-tagged-as-merged' into 'master' 2016-10-12T10:17:35+00:00 Douwe Maan douwe@gitlab.com 2016-10-12T10:17:35+00:00 d1eab555b6f38552841a7a1d956c241d91a6f2d4 Removes inconsistency regarding tagging immediately as merged once you create a … - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] API support added - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #20708 See merge request !6408 

Removes inconsistency regarding tagging immediately as merged once you create a …

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [x] API support added
- Tests
  - [x] Added for this feature/bug
  - [x] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

## What are the relevant issue numbers?


Closes #20708

See merge request !6408
 refactors tests because of gitlab-test repository changes 2016-10-11T15:33:06+00:00 tiagonbotelho tiagonbotelho@hotmail.com 2016-10-03T12:11:16+00:00 c90483406ecc2717076391737ff57167b5a03393 






Fix Error 500 when viewing old merge requests with bad diff data
2016-10-10T20:05:09+00:00

Stan Hu
stanhu@gmail.com

2016-10-08T05:48:23+00:00

d4fab17d7c8c2b233248295755a6277fdee09c9f

Customers running old versions of GitLab may have MergeRequestDiffs with
the text ["--broken diff"] due to text generated by gitlab_git 1.0.3.
To avoid the Error 500, verify that each element is a type that gitlab_git
will accept before attempting to create a DiffCollection.

Closes #20776





Customers running old versions of GitLab may have MergeRequestDiffs with
the text ["--broken diff"] due to text generated by gitlab_git 1.0.3.
To avoid the Error 500, verify that each element is a type that gitlab_git
will accept before attempting to create a DiffCollection.

Closes #20776







Add test for MergeRequestDiff#commits_sha, feedback:
2016-09-22T09:36:43+00:00

Lin Jen-Shin
godfat@godfat.org

2016-09-22T09:34:46+00:00

b0ce4ca11012388b1e4fbc1d928cbf4c0da66104

https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6470#note_15856755





https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6470#note_15856755







Add code improvements to merge request version feature
2016-08-25T07:59:30+00:00

Dmitriy Zaporozhets
dmitriy.zaporozhets@gmail.com

2016-08-25T07:59:30+00:00

d64c15c5c391e8f49a9f261ba0e59bafb99d97fe

* Add MergeRequestDiff#latest?
* Remove unnecessary variable assignment

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>





* Add MergeRequestDiff#latest?
* Remove unnecessary variable assignment

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>







Merge branch 'master' into dz-merge-request-version
2016-08-15T14:27:22+00:00

Dmitriy Zaporozhets
dmitriy.zaporozhets@gmail.com

2016-08-15T14:27:22+00:00

5e95c0b8d201a6bfdd020aa29a5a6e14c7085e3f

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>





Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>







change the API on the merge_request_diff model from diffs -> raw_diffs
2016-08-03T21:32:12+00:00

Paco Guzman
pacoguzmanp@gmail.com

2016-08-03T21:32:12+00:00

631f59d4e7f449c59735cd7eab25cf407e06d5d8