delta/gitlab/gitlab-ce.git/app/controllers/projects, branch compare-code-view

Apply diff view cookie on compare

2016-07-15T18:42:18+00:00

Closes #19573

Revert "Optimistic locking for Issue and Merge Requests"

2016-07-14T02:17:17+00:00

This reverts commit c39356998b1850f3dc26fe0b987cb419c1d1afb4.

Revert "Merge branch '18193-developers-can-merge' into 'master' "

2016-07-13T18:57:30+00:00

This reverts commit 9ca633eb4c62231e4ddff5466c723cf8e2bdb25d, reversing
changes made to fb229bbf7970ba908962b837b270adf56f14098f.

Added "developers can merge" setting to protected branches

2016-07-13T07:54:26+00:00

- Cherry-picked from `mvestergaard:branch-protection-dev-merge`
- https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4220

Merge branch 'lock_for_issuable' into 'master'

2016-07-12T17:52:51+00:00


Optimistic locking for Issue and Merge Requests

## What does this MR do?

It implements Optimistic Locking http://api.rubyonrails.org/classes/ActiveRecord/Locking/Optimistic.html for Issues and MRs but in a bit custom way. We use it for cases when either title or description field is involved in the change.

## Why was this MR needed?

We have to prevent data losing.

## What are the relevant issue numbers?
https://gitlab.com/gitlab-org/gitlab-ce/issues/12940

## Screenshots (if relevant)

![Screen_Shot_2016-07-09_at_15.33.02](/uploads/2efbe547a12fda93bce347fa711438d7/Screen_Shot_2016-07-09_at_15.33.02.png)


See merge request !5146

Cache todos pending/done dashboard query counts

2016-07-12T16:57:52+00:00

Optimistic locking for Issue and Merge Requests

2016-07-12T16:52:14+00:00

Be explicit on merge request discussion variables

2016-07-12T12:37:12+00:00

Merge branch 'single-file-diffs' into 'master'

2016-07-11T17:51:57+00:00


Single file diffs

Closes #14103. Related (not part of this MR): #19553.

This adds a `diff_for_path` action to each place we render diffs (commit, compare, new MR, existing MR) which renders the diff for a single path. The action is always available with the same params as the 'parent' action, to make it simpler to generate the URIs.

If a diff is bigger than 10 KB, it will be collapsed by default and have a data attribute added. You can then click the message or the filename to expand that diff. For expanded files, you can collapse and expand them, but they won't make any AJAX requests.

![Expand_and_collapse_diffs](/uploads/a4072029085082b85c47006f67ac531c/Expand_and_collapse_diffs.gif)

See merge request !4990

Merge branch 'send-entry-via-Gitlab-Workhorse-Send-Data' into 'master'

2016-07-11T16:18:37+00:00


Use Gitlab-Workhorse-Send-Data to send entry

## What does this MR do?

Use Gitlab-Workhorse-Send-Data to send entry:

Closes #19224, Closes #19128

Also requires this MR to work:
https://gitlab.com/gitlab-org/gitlab-workhorse/merge_requests/53

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

Do we have a test for this?

## Why was this MR needed?

This way gitlab-workhorse does not have to call any API.

See merge request !5094