delta/gitlab/gitlab-ce.git, branch doc_ldap_fixes gitlab.com: gitlab-org/gitlab-ce.git Fix LDAP link and codeblock indentation 2016-04-05T14:04:16+00:00 Achilleas Pipinellis axilleas@axilleas.me 2016-04-05T14:04:16+00:00 7b290e29f0c7484617d4f1c09244db84c00c11b4 [ci skip] 
[ci skip]
Merge branch 'fix-gh-pr-import' into 'master' 2016-04-05T08:17:47+00:00 Yorick Peterse yorickpeterse@gmail.com 2016-04-05T08:17:47+00:00 8a0a802ee960a21145995661c3751bbe8cde9e5c Fix Importing repos from GHE doesn't work See merge request !3529 

Fix Importing repos from GHE doesn't work

See merge request !3529
 Merge branch 'banzai-image-link' into 'master' 2016-04-05T03:52:31+00:00 Robert Speicher robert@gitlab.com 2016-04-05T03:52:31+00:00 6bf4e9e75232be83995a09f3a83e47fd0103273f Add link to image URL for images in discussions. The main problem with this is that it doesn't apply retroactively, only to images that are uploaded after this change. It's also hacky and probably not the most optimal solution. Resolves #14411. See merge request !3464 

Add link to image URL for images in discussions.

The main problem with this is that it doesn't apply retroactively, only to images that are uploaded after this change. It's also hacky and probably not the most optimal solution.

Resolves #14411.

See merge request !3464
 Wrap images in discussions and wikis with a link to the image source using ImageLinkFilter. 2016-04-05T01:44:07+00:00 connorshea connor.james.shea@gmail.com 2016-03-30T22:03:49+00:00 b9abf938edf52e762d320b1eb8732155e23d7b72 Resolves #14411. See merge request !3464 
Resolves #14411.

See merge request !3464
Merge branch 'remove-2fa-status' into 'master' 2016-04-04T23:14:04+00:00 Jacob Schatz jschatz1@gmail.com 2016-04-04T23:14:04+00:00 67136007933425414293602bc75d2ba4822f2a93 Remove 2FA status on enable page The 2FA status on the enabling page is useless, since it always is `disabled`. A user is enabling 2FA, so he already knows that it is disabled. ### Before ![Screenshot_2016-03-29_12.41.27](/uploads/4800a13a82f176077a11ecaf13ed0cb1/Screenshot_2016-03-29_12.41.27.png) ### After ![Screenshot_2016-03-29_12.40.55](/uploads/a77e8acd7cf99190bbd6bd340542ad10/Screenshot_2016-03-29_12.40.55.png) See merge request !3436 

Remove 2FA status on enable page

The 2FA status on the enabling page is useless, since it always is `disabled`. A user is enabling 2FA, so he already knows that it is disabled.

### Before

![Screenshot_2016-03-29_12.41.27](/uploads/4800a13a82f176077a11ecaf13ed0cb1/Screenshot_2016-03-29_12.41.27.png)

### After
![Screenshot_2016-03-29_12.40.55](/uploads/a77e8acd7cf99190bbd6bd340542ad10/Screenshot_2016-03-29_12.40.55.png)

See merge request !3436
 Flush repository cache before import project data 2016-04-04T22:35:39+00:00 Douglas Barbosa Alexandre dbalexandre@gmail.com 2016-04-04T22:35:39+00:00 f2005fa56682a5dc3b57d610cb733a34b2e08520 GitHub Pull Requests importer handle with the repository while importing data, we need to make sure that the cached values are valid. 
GitHub Pull Requests importer handle with the repository while
importing data, we need to make sure that the cached values are valid.
Merge branch 'admin-pages-layout' into 'master' 2016-04-04T22:25:06+00:00 Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com 2016-04-04T22:25:06+00:00 8f9586421dc3327845e9ebc4b706daabf2e10ff6 Improve UI for admin/groups page Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> cc @jschatz1 @skyruler See merge request !3523 

Improve UI for admin/groups page

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

cc @jschatz1 @skyruler 

See merge request !3523
 Single quotes paradise 2016-04-04T21:52:27+00:00 Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com 2016-04-04T21:52:27+00:00 be6f1c74278519d49244a5c29b016725b8eec1e3 Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2016-04-04T20:56:19+00:00 Yorick Peterse yorickpeterse@gmail.com 2016-04-04T20:56:19+00:00 a55fc41657567fc0343fe5cd6fee8c5e20c851ce 






Merge branch 'dz-admin-area-fixes' into 'master'

2016-04-04T20:01:46+00:00

Jacob Schatz
jschatz1@gmail.com

2016-04-04T20:01:46+00:00

638012c23fcae5c77653a4b74424267a158134d7


Set of UI fixes for admin area



See merge request !3525





Set of UI fixes for admin area



See merge request !3525