gitlab-org--gitlab-foss/spec
Douwe Maan 65af1b3d7f Merge branch 'dz-improve-mr-compar' into 'master'
Improve merge request versions compare logic

## What does this MR do?

Changes the way how we compare between for merge request versions 

## Are there points in the code the reviewer needs to double check?

no 

## Why was this MR needed?

So when I squash+rebase my commit I can get more accurate diff on what changed between versions

## Screenshots (if relevant)

in discussion (below)

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [ ] ~~[Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~
- [ ] ~~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?

https://gitlab.com/gitlab-org/gitlab-ce/issues/22368, https://gitlab.com/gitlab-org/gitlab-ce/issues/22721

See merge request !6589
2016-10-12 19:54:22 +00:00
..
config
controllers Merge branch '20708-new-branch-is-immediatelly-tagged-as-merged' into 'master' 2016-10-12 10:17:35 +00:00
factories
features Merge branch 'assign-issues-for-merge-request-18876' into 'master' 2016-10-11 17:20:38 +00:00
finders Precalculate trending projects 2016-10-10 12:27:08 +02:00
fixtures
helpers refactors tests because of gitlab-test repository changes 2016-10-11 16:33:06 +01:00
initializers
javascripts Prevent conflict b/w search field and its dropdown 2016-10-10 10:16:09 +02:00
lib Merge branch '20708-new-branch-is-immediatelly-tagged-as-merged' into 'master' 2016-10-12 10:17:35 +00:00
mailers refactors tests because of gitlab-test repository changes 2016-10-11 16:33:06 +01:00
models Better tests for MergeRequestDiff#compare_with method 2016-10-12 16:32:57 +03:00
policies Make guests unable to view MRs 2016-10-11 16:51:26 +03:00
requests Merge branch 'api-version' into 'master' 2016-10-12 18:38:02 +00:00
routing Merge branch 'atom-routes' into 'master' 2016-10-11 14:04:31 +00:00
services Refactor straight compare diff code 2016-10-12 16:32:57 +03:00
support writes tests to verify the issue is solved and fixes breaking issues. 2016-10-09 23:20:45 +01:00
tasks/gitlab Add a new gitlab:users:clear_all_authentication_tokens task 2016-10-11 10:21:18 +02:00
uploaders
views
workers Merge branch '20708-new-branch-is-immediatelly-tagged-as-merged' into 'master' 2016-10-12 10:17:35 +00:00
factories_spec.rb
rails_helper.rb
simplecov_env.rb
spec_helper.rb Revert "Merge branch 'tests-use-tmpfs' into 'master'" 2016-10-12 14:45:26 +00:00
teaspoon_env.rb