diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-10-12 19:54:22 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-10-12 19:54:22 +0000 |
| commit | 65af1b3d7f19fd217bc5805f370c83a4338f1a01 (patch) | |
| tree | 7773b87851d91e6c247281acdae02705fb21201f /Gemfile.lock | |
| parent | 58e2b44afe535100508eb4d49d7e7df24e408383 (diff) | |
| parent | 3dd7ad5064afa49aa74a7d40ba02fff7e67846d2 (diff) | |
| download | gitlab-ce-65af1b3d7f19fd217bc5805f370c83a4338f1a01.tar.gz | |
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
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 924e3a6781a..067908af3fb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -282,7 +282,7 @@ GEM diff-lcs (~> 1.1) mime-types (>= 1.16, < 3) posix-spawn (~> 0.3) - gitlab_git (10.6.7) + gitlab_git (10.6.8) activesupport (~> 4.0) charlock_holmes (~> 0.7.3) github-linguist (~> 4.7.0) @@ -866,7 +866,7 @@ DEPENDENCIES github-linguist (~> 4.7.0) github-markup (~> 1.4) gitlab-flowdock-git-hook (~> 1.0.1) - gitlab_git (~> 10.6.7) + gitlab_git (~> 10.6.8) gitlab_omniauth-ldap (~> 1.2.1) gollum-lib (~> 4.2) gollum-rugged_adapter (~> 0.4.2) |