delta/gitlab/gitlab-ce.git/app/controllers/projects, branch rc-document-preferred-array-syntax

fixes distinction between renaming a file and updating its content and

2016-09-10T03:05:30+00:00

refactors update file

Merge branch 'gitlab-workhorse-safeties' into 'master'

2016-09-09T11:33:08+00:00


Security and safety improvements for gitlab-workhorse integration

Companion to https://gitlab.com/gitlab-org/gitlab-workhorse/merge_requests/60

- Use a custom content type when sending data to gitlab-workhorse
- Verify (using JWT and a shared secret on disk) that internal API requests came from gitlab-workhorse

This will allow us to build features in gitlab-workhorse that require
more trust, and protect us against programming mistakes in the future.

This is designed so that no action is required for installations from
source. For omnibus-gitlab we need to add code that manages the shared
secret.

See merge request !5907

Merge branch 'dz-bulk-edit-mr' into 'master'

2016-09-08T15:56:37+00:00


Add bulk update support for merge requests list

## What does this MR do?

Adds new feature: ability to update multiple merge requests at once from index page (same like we have for issues already)

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

I don't think so

## Why was this MR needed?

* consistency with issues
* save user time when you want set same label/milestone to 20 merge requests 

## Screenshots (if relevant)

![Screenshot_2016-09-08_11.48.49](/uploads/fe50b2472330e211eb8d6d6dafb15667/Screenshot_2016-09-08_11.48.49.png)![Screenshot_2016-09-08_11.48.46](/uploads/4833c3705120ec028f7a62a4e128998d/Screenshot_2016-09-08_11.48.46.png)

## Does this MR meet the acceptance criteria?

- [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?

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/20087

See merge request !6226

Merge branch 'dz-mr-version-compare' into 'master'

2016-09-08T13:25:04+00:00


Allow compare merge request versions

## What does this MR do?

Add new functionality to the merge request page. It allows you easily compare merge request versions in one click.  

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

## Why was this MR needed?

To improve code review experience. 

## Screenshots (if relevant)

See discussion

## Does this MR meet the acceptance criteria?

- [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 [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/13570

See merge request !6127

Add bulk update support for merge requests list

2016-09-08T08:52:20+00:00

Signed-off-by: Dmitriy Zaporozhets

Use PipelinesFinder in Pipelines API

2016-09-07T13:38:03+00:00

Refactor compared_diff_version method in merge requests controller

2016-09-07T07:24:48+00:00

Signed-off-by: Dmitriy Zaporozhets

Refactor merge request version compare feature

2016-09-07T07:24:48+00:00

Signed-off-by: Dmitriy Zaporozhets

Improve merge request version feature

2016-09-07T07:24:48+00:00

* Use version numbers instead of sha as more user-friendly
* Make it clear that we compare later version (left) with older one (right)
* Improve wording of version switch panel

Signed-off-by: Dmitriy Zaporozhets

Refactor code for merge request version compare feature

2016-09-07T07:22:57+00:00

Signed-off-by: Dmitriy Zaporozhets