delta/gitlab/gitlab-ce.git/spec/controllers, branch patch-23 gitlab.com: gitlab-org/gitlab-ce.git Merge branch 'sh-recaptcha-fix-try2' into 'master' 2017-06-12T08:31:20+00:00 Sean McGivern sean@mcgivern.me.uk 2017-06-12T08:24:27+00:00 09420c6d8fe4f428d0a7aaebadf15ddd4cfc36fc Make sure reCAPTCHA configuration is loaded when spam checks are initiated Closes #33532 See merge request !12080 
Make sure reCAPTCHA configuration is loaded when spam checks are initiated

Closes #33532

See merge request !12080
 Merge branch '32977-user-autocomplete-per_page-does-not-work' into 'master' 2017-06-08T11:39:49+00:00 Douwe Maan douwe@gitlab.com 2017-05-29T13:49:01+00:00 e3228dcbf09d572be5f11b0294cb49b02f1ea71e Resolve "User autocomplete per_page does not work" Closes #32977 See merge request !11742 
Resolve "User autocomplete per_page does not work"

Closes #32977

See merge request !11742
 Merge branch 'fix/gb/use-merge-ability-for-protected-manual-actions' into 'master' 2017-06-08T10:27:20+00:00 Kamil Trzciński ayufan@ayufan.eu 2017-05-31T13:37:49+00:00 47420a2d6222b36bb58599b181075e2a356665ea Check only a merge ability for protected actions Closes #32618 See merge request !11648 
Check only a merge ability for protected actions

Closes #32618

See merge request !11648
 Merge remote-tracking branch 'gitlab/9-2-stable' into 9-2-stable 2017-06-08T01:42:32+00:00 Regis boudinot.regis@yahoo.com 2017-06-08T01:42:32+00:00 3b87edfaafa772d5c6a9276868b46a7929d55077 






All ancestor groups should be returned by GroupsFinder
2017-05-31T08:12:26+00:00

Toon Claes
toon@gitlab.com

2017-05-30T14:48:42+00:00

3ea9de81f2789093317eb583364059414f1ab6bc

And not only the group in which the authorized project is located, but every
group that is a parent or grandparent of the group in which the project
resides.





And not only the group in which the authorized project is located, but every
group that is a parent or grandparent of the group in which the project
resides.







Merge branch 'dz-restrict-autocomplete' into 'security-9-1'

2017-05-31T03:56:59+00:00

Robert Speicher
robert@gitlab.com

2017-05-07T21:15:06+00:00

664ee81486a3205675cfadf3c98f9654d256f538


Allow users autocomplete by author_id only for authenticated users

See merge request !2100





Allow users autocomplete by author_id only for authenticated users

See merge request !2100






Merge branch 'dm-fix-routes' into 'master'
2017-05-25T05:04:04+00:00

Robert Speicher
robert@gitlab.com

2017-05-24T15:08:05+00:00

218eae87754711b9e89a98301ae04ca293fdf934

Fix ambiguous routing issues by teaching router about reserved words

See merge request !11570




Fix ambiguous routing issues by teaching router about reserved words

See merge request !11570






Merge branch '32536-mr-widget-performance-improvements' into 'master'
2017-05-23T14:51:15+00:00

Fatih Acet
acetfatih@gmail.com

2017-05-19T19:52:45+00:00

677229bb4cce279149e983afdfb86ec18c27e710

Load improvements related to MR widget

See merge request !11518




Load improvements related to MR widget

See merge request !11518






Merge branch 'fix-issue-32506' into 'master'
2017-05-19T21:57:21+00:00

Douwe Maan
douwe@gitlab.com

2017-05-19T19:28:38+00:00

ee712af72674c48a1465b5665da9d0edd71337ad

Fix redirects modifying the host

Closes #32506

See merge request !11498




Fix redirects modifying the host

Closes #32506

See merge request !11498






Merge branch '9-2-stable-fix-conflicts-for-mr-11298' into '9-2-stable'
2017-05-19T15:22:21+00:00

Douwe Maan
douwe@gitlab.com

2017-05-19T15:22:21+00:00

441f37f23bc2aa2669107d6bc8bed86046e225f4

Fix 9.2 conflicts for "Fix conflict resolution from corrupted upstream"

See merge request !11533




Fix 9.2 conflicts for "Fix conflict resolution from corrupted upstream"

See merge request !11533