delta/gitlab/gitlab-ce.git/app, branch patch-6 gitlab.com: gitlab-org/gitlab-ce.git Merge branch 'dz-improve-mr-compar' into 'master' 2016-10-12T19:54:22+00:00 Douwe Maan douwe@gitlab.com 2016-10-12T19:54:22+00:00 65af1b3d7f19fd217bc5805f370c83a4338f1a01 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 

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
 Merge branch '17541-move-licenses-api-endpoint-to-templates-licenses' into 'master' 2016-10-12T15:03:21+00:00 Rémy Coutable remy@rymai.me 2016-10-12T15:03:21+00:00 3c31f185b931a4054804aee56be0602135b75bed Resolve "Move `/licenses` api endpoint to `/templates/licenses`" ## What does this MR do? It moves the `/licenses`, `/gitignores` and `/gitlab_ci_ymls` API endpoints under the `/templates` namespace ## Why was this MR needed? In EE we now have somewhat ambiguous API endpoints. `/license` refers to the EE license while `/licenses` (plural) refers to license templates. @DouweM mentioned that we're adding .gitignore templates in #14106 so it may make sense to add a /templates namespace. Then, move the /license templates endpoint to be underneath, along with .gitignore endpoints. Closes #17541 See merge request !5717 

Resolve "Move `/licenses` api endpoint to `/templates/licenses`"

## What does this MR do?

It moves the `/licenses`, `/gitignores` and `/gitlab_ci_ymls` API endpoints under the `/templates` namespace

## Why was this MR needed?

In EE we now have somewhat ambiguous API endpoints. `/license` refers to the EE license while `/licenses` (plural) refers to license templates. @DouweM mentioned that we're adding .gitignore templates in #14106 so it may make sense to add a /templates namespace. Then, move the /license templates endpoint to be underneath, along with .gitignore endpoints. 

Closes #17541

See merge request !5717
 Improve mr compare message when base is different 2016-10-12T14:42:32+00:00 Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com 2016-10-12T14:42:32+00:00 3dd7ad5064afa49aa74a7d40ba02fff7e67846d2 Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Inform user when comparing 2 version with different base 2016-10-12T13:32:57+00:00 Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com 2016-10-12T12:09:34+00:00 c65c800f8e466ffcfb58613fc775c4afa11f91e6 Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Refactor straight compare diff code 2016-10-12T13:32:57+00:00 Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com 2016-10-12T10:27:59+00:00 b48c4b2662e7db9d68052392fb34dd2b27d12cf5 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>
Use straight diff approach when compare merge request versions 2016-10-12T13:32:57+00:00 Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com 2016-09-29T11:04:50+00:00 ac4db38094f4a68a81b0a7570c5835f663c01cfd Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Merge branch 'add-disabled-delete-button' into 'master' 2016-10-12T11:03:55+00:00 Robert Speicher robert@gitlab.com 2016-10-12T11:03:55+00:00 c004bb3e74b6a60a4b6ede93d0ea8a898e56c41b Add disabled delete button to protected branches ## What does this MR do? Add's a disabled CSS style for the delete button on protected branches instead of hiding the button ## What are the relevant issue numbers? Closes #22358 See merge request !6439 

Add disabled delete button to protected branches

## What does this MR do?
Add's a disabled CSS style for the delete button on protected branches instead of hiding the button

## What are the relevant issue numbers?
Closes #22358

See merge request !6439
 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
 Create a new /templates API namespace 2016-10-12T09:09:41+00:00 Thomas Balthazar thomas@balthazar.info 2016-08-08T11:42:24+00:00 b9b13ea8016077e186374e4ee45dfc8a59ea5a78 The /licenses, /gitignores and /gitlab_ci_ymls endpoints are now also available under a new /templates namespace. Old endpoints will be deprecated when GitLab 9.0.0 is released. 
The /licenses, /gitignores and /gitlab_ci_ymls endpoints are now also
available under a new /templates namespace. Old endpoints will be
deprecated when GitLab 9.0.0 is released.