delta/gitlab/gitlab-ce.git/app/controllers, branch compare-code-view gitlab.com: gitlab-org/gitlab-ce.git Apply diff view cookie on compare 2016-07-15T18:42:18+00:00 Phil Hughes me@iamphill.com 2016-07-07T11:36:33+00:00 a9d5b07769b56286903534cde0fcf8e6063c8eb0 Closes #19573 
Closes #19573
Revert "Optimistic locking for Issue and Merge Requests" 2016-07-14T02:17:17+00:00 Stan Hu stanhu@gmail.com 2016-07-14T02:17:17+00:00 d7c591915893c8c572e9135db4ec27dc174823fd This reverts commit c39356998b1850f3dc26fe0b987cb419c1d1afb4. 
This reverts commit c39356998b1850f3dc26fe0b987cb419c1d1afb4.
Revert "Merge branch '18193-developers-can-merge' into 'master' " 2016-07-13T18:57:30+00:00 Robert Speicher rspeicher@gmail.com 2016-07-13T18:57:30+00:00 530f5158e297f3cde27f3566cfe13bad74ba3b50 This reverts commit 9ca633eb4c62231e4ddff5466c723cf8e2bdb25d, reversing changes made to fb229bbf7970ba908962b837b270adf56f14098f. 
This reverts commit 9ca633eb4c62231e4ddff5466c723cf8e2bdb25d, reversing
changes made to fb229bbf7970ba908962b837b270adf56f14098f.
Added "developers can merge" setting to protected branches 2016-07-13T07:54:26+00:00 Mathias Vestergaard mathias.vestergaard@gmail.com 2016-05-19T23:58:34+00:00 f0577d838544152f558411ef1101d56c5852d92e - Cherry-picked from `mvestergaard:branch-protection-dev-merge` - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4220 
- Cherry-picked from `mvestergaard:branch-protection-dev-merge`
- https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4220
Merge branch 'add-2fa-check-to-oauth' into 'master' 2016-07-12T20:53:09+00:00 Robert Speicher robert@gitlab.com 2016-07-12T20:53:09+00:00 488a7f5976264975c7e418674e52fb08db82bce7 Add 2FA check to the OAuth authentication mechanism Needed for https://gitlab.com/gitlab-org/gitlab-ce/issues/19312 2FA checks were not being performed when logging in via any of the OAuth providers. Just LDAP had the check. This MR fixes that. See merge request !1976 

Add 2FA check to the OAuth authentication mechanism

Needed for https://gitlab.com/gitlab-org/gitlab-ce/issues/19312

2FA checks were not being performed when logging in via any of the OAuth providers. Just LDAP had the check. This MR fixes that.

See merge request !1976
 Merge branch 'lock_for_issuable' into 'master' 2016-07-12T17:52:51+00:00 Douwe Maan douwe@gitlab.com 2016-07-12T17:52:51+00:00 d5c715c9cc23a403d908e4686db152d8316ac684 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 

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 Paco Guzman pacoguzmanp@gmail.com 2016-07-11T06:10:04+00:00 244134f9c33dea0003dc2403dceace4b94a87d2e 






Optimistic locking for Issue and Merge Requests
2016-07-12T16:52:14+00:00

Valery Sizov
valery@gitlab.com

2016-07-07T21:42:16+00:00

c39356998b1850f3dc26fe0b987cb419c1d1afb4












Be explicit on merge request discussion variables
2016-07-12T12:37:12+00:00

Paco Guzman
pacoguzmanp@gmail.com

2016-07-12T12:29:26+00:00

f1f9b5e2f0f7ab8515f263b79c09d9f98b0d302f












Clean path info
2016-07-11T19:12:55+00:00

Connor Shea
connor.james.shea@gmail.com

2016-07-11T19:12:55+00:00

bd09b2d563d7190ab26f820401e4d981022022c8