Commits · 79d6513f360d7d305b4276777973dfd991c347f8 · Tatuya Kamada / gitlab-ce

05 Apr, 2016 21 commits
- Merge branch 'markdown-attribution' into 'master' · 79d6513f
  Sytse Sijbrandij authored Apr 05, 2016
```
Attribution where it is due.

Inspired by https://news.ycombinator.com/item?id=11431969

See merge request !3546
```
  79d6513f
- Merge branch 'upgrade-bundler-audit' into 'master' · c61fe245
  Robert Speicher authored Apr 05, 2016
```
Upgrade bundler-audit from 0.4.0 to 0.5.0

Bundler Audit can now run the `check` command with an `—update` flag to update the Ruby CVE repository before checking. This removes the need for two separate commands in GitLab CI ([source](https://github.com/rubysec/bundler-audit#synopsis)).

See the Changelog for more information: https://github.com/rubysec/bundler-audit/blob/master/ChangeLog.md#050--2015-02-28

See merge request !3433
```
  c61fe245
- Attribution where it is due. · 400a7b99
  Sytse Sijbrandij authored Apr 05, 2016
  
  400a7b99
- Merge branch 'fix/permissions-when-importing-members' into 'master' · 7ff974e3
  Douwe Maan authored Apr 05, 2016
```
Check permissions when importing project members

Closes #14899

See merge request !3535
```
  7ff974e3
- Add 8.4.6 and 8.4.7 CHANGELOG items · 9f33bf86
  Rémy Coutable authored Apr 05, 2016
```
[ci skip]
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  9f33bf86
- Add 8.5.9 CHANGELOG item · c8d0f355
  Rémy Coutable authored Apr 05, 2016
```
[ci skip]
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  c8d0f355
- Merge branch 'doc_ldap_fixes' into 'master' · 59466a47
  Achilleas Pipinellis authored Apr 05, 2016
```
Fix LDAP link and codeblock indentation



See merge request !3538
```
  59466a47
- Fix LDAP link and codeblock indentation · 7b290e29
  Achilleas Pipinellis authored Apr 05, 2016
```
[ci skip]
```
  7b290e29
- Merge branch 'reorder-language' into 'master' · e1bc16cb
  Yorick Peterse authored Apr 05, 2016
```
Update language after doing all other operations

See merge request !3533
```
  e1bc16cb
- Merge branch 'build-notification-changelog' into 'master' · 353365c7
  Jacob Schatz authored Apr 05, 2016
```
Added CHANGELOG for build notifications

[ci skip]

See merge request !3537
```
  353365c7
- Respond 404 when unauthorized user imports members · bb9c194c
  Grzegorz Bizon authored Apr 05, 2016
  
  bb9c194c
- Added CHANGELOG for build notifications · f22e6515
  Phil Hughes authored Apr 05, 2016
```
[ci skip]
```
  f22e6515
- Merge branch 'scss-lint-comments' into 'master' · 97747233
  Jacob Schatz authored Apr 05, 2016
```
Add comments to the SCSS Lint config file [ci skip]

This MR also adds some previously missing linters.

See merge request !3500
```
  97747233
- Do not leak project exists when importing members · c52b5c92
  Grzegorz Bizon authored Apr 05, 2016
```
When importing members, and user does not have permissions to read
members in a source project, do not leak information about source
project existence. Notifiy user that project has not been found instead.
```
  c52b5c92
- Merge branch 'missing-changelog' into 'master' · 095386d6
  Jacob Schatz authored Apr 05, 2016
```
Add missing changelog item about improving navigation sidebar
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

For !3494 and #14838 

See merge request !3527
```
  095386d6
- Check permissions when importing project members · b248ee93
  Grzegorz Bizon authored Apr 05, 2016
```
Closes #14899
```
  b248ee93
- Update language only on HEAD of the repository · aad3b6dd
  Kamil Trzcinski authored Apr 05, 2016
  
  aad3b6dd
- Update language after doing all other operations · b8d1545b
  Kamil Trzcinski authored Apr 05, 2016
  
  b8d1545b
- Merge branch 'fix-gh-pr-import' into 'master' · 8a0a802e
  Yorick Peterse authored Apr 05, 2016
```
Fix Importing repos from GHE doesn't work

See merge request !3529
```
  8a0a802e
- Merge branch 'banzai-image-link' into 'master' · 6bf4e9e7
  Robert Speicher authored Apr 05, 2016
```
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
```
  6bf4e9e7
- Wrap images in discussions and wikis with a link to the image source using ImageLinkFilter. · b9abf938
  connorshea authored Mar 30, 2016
```
Resolves #14411.

See merge request !3464
```
  b9abf938
04 Apr, 2016 19 commits

Add comments to the SCSS Lint config file [ci skip] · 21837bfb
connorshea authored Apr 02, 2016
```
Also add some previously missing linters.
```
21837bfb

Merge branch 'remove-2fa-status' into 'master' · 67136007

Jacob Schatz authored Apr 04, 2016

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

67136007

Flush repository cache before import project data · f2005fa5

Douglas Barbosa Alexandre authored Apr 04, 2016

GitHub Pull Requests importer handle with the repository while
importing data, we need to make sure that the cached values are valid.

f2005fa5

Merge branch 'admin-pages-layout' into 'master' · 8f958642

Dmitriy Zaporozhets authored Apr 04, 2016

Improve UI for admin/groups page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

cc @jschatz1 @skyruler 

See merge request !3523

8f958642

Add missing changelog item about improving navigation sidebar · 4b3747b2
Dmitriy Zaporozhets authored Apr 04, 2016
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
4b3747b2
Single quotes paradise · be6f1c74
Dmitriy Zaporozhets authored Apr 04, 2016
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
be6f1c74
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce · a55fc416
Yorick Peterse authored Apr 04, 2016

a55fc416
Merge branch 'dz-admin-area-fixes' into 'master' · 638012c2
Jacob Schatz authored Apr 04, 2016
```
Set of UI fixes for admin area



See merge request !3525
```
638012c2
Merge branch 'fix-forked-project-link-specs' into 'master' · b530cabd
Yorick Peterse authored Apr 04, 2016
```
Reload forked_project_link projects

See merge request !3526
```
b530cabd

Merge branch 'hide_profile_activity_on_mobile' into 'master' · c653b1b4

Jacob Schatz authored Apr 04, 2016

Hide user profile activity graph on mobile

closes #14507 

## Before
![Screen_Shot_2016-03-26_at_10.28.21_PM](/uploads/5d5e2f77de936c2f2cd8a95132720a81/Screen_Shot_2016-03-26_at_10.28.21_PM.png)

## After
![Screen_Shot_2016-03-26_at_10.27.01_PM](/uploads/c011497b31368a0b7aa7d851541ac301/Screen_Shot_2016-03-26_at_10.27.01_PM.png)

## Medium width screen
![fix2](/uploads/2a5eb2d01f1a516991cd3e2b35b8aadc/fix2.gif)

See merge request !3412

c653b1b4

Merge branch 'hide_profile_activity_on_mobile' into 'master' · 1926e55e

Jacob Schatz authored Apr 04, 2016

Hide user profile activity graph on mobile

closes #14507 

## Before
![Screen_Shot_2016-03-26_at_10.28.21_PM](/uploads/5d5e2f77de936c2f2cd8a95132720a81/Screen_Shot_2016-03-26_at_10.28.21_PM.png)

## After
![Screen_Shot_2016-03-26_at_10.27.01_PM](/uploads/c011497b31368a0b7aa7d851541ac301/Screen_Shot_2016-03-26_at_10.27.01_PM.png)

## Medium width screen
![fix2](/uploads/2a5eb2d01f1a516991cd3e2b35b8aadc/fix2.gif)

See merge request !3412

1926e55e

Merge branch 'fix-award-emoji-menu' into 'master' · 2fb0ef51

Jacob Schatz authored Apr 04, 2016

Fix award emoji picker for relative_url

MR !2888 caused a regression where the emoji picker does not load when
using relative_url, because the path for the controller was hardcoded.

See merge request !3493

2fb0ef51

Reload forked_project_link projects · 6e0f8453

Yorick Peterse authored Apr 04, 2016

This fixes ./spec/services/projects/unlink_fork_service_spec.rb which
somehow started failing on the master branch. It certainly isn't a very
elegant solution but seems to be the easiest/best way of solving this
problem for the time being.

6e0f8453

Merge branch '14083-build-labels' into 'master' · d5169a60

Jacob Schatz authored Apr 04, 2016

Add labels to block element

Fixes #14083

Before:![Screen_Shot_2016-04-04_at_11.22.27_AM](/uploads/c35afd95ebca1b72f2aa37c72dc3c1a9/Screen_Shot_2016-04-04_at_11.22.27_AM.png)

After: ![Screen_Shot_2016-04-04_at_11.21.34_AM](/uploads/94f180858cf8fe2fc7eeec541ce66d44/Screen_Shot_2016-04-04_at_11.21.34_AM.png)

See merge request !3492

d5169a60

Fix missing paddings in admin area · f9fd0031
Dmitriy Zaporozhets authored Apr 04, 2016
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
f9fd0031
Dont use monospace font for names · 3e6d27ee
Dmitriy Zaporozhets authored Apr 04, 2016
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
3e6d27ee

Merge branch 'fix-ui-event' into 'master' · 531e4bda

Dmitriy Zaporozhets authored Apr 04, 2016

Fix event rendering when create project
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

cc @jschatz1 

See merge request !3522

531e4bda

Improve UI for admin/groups page · d5fadfe0
Dmitriy Zaporozhets authored Apr 04, 2016
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
d5fadfe0
Fix event rendering when create project · 11c1dda3
Dmitriy Zaporozhets authored Apr 04, 2016
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
11c1dda3