home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-19 17:46:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
26,198 Commits 48 Branches 340 Tags
33faf219aaf72bb2c8a6df06fd42adf17bebfd14
Commit Graph
26198 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Annabel Dunstone 33faf219aa Fix data check in update issue response 2016-04-05 11:43:30 -07:00
Robert Speicher b8d0f17422 The Markdown doc is one place where trailing whitespace matters 
[ci skip]
 2016-04-05 14:06:56 -04:00
Sytse Sijbrandij 79d6513f36 Merge branch 'markdown-attribution' into 'master' 
Attribution where it is due.

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

See merge request !3546
 2016-04-05 18:03:02 +00:00
Robert Speicher c61fe24529 Merge branch 'upgrade-bundler-audit' into 'master' 
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
 2016-04-05 17:40:52 +00:00
Sytse Sijbrandij 400a7b995d Attribution where it is due. 2016-04-05 13:24:58 -04:00
Douwe Maan 7ff974e38e Merge branch 'fix/permissions-when-importing-members' into 'master' 
Check permissions when importing project members

Closes #14899

See merge request !3535
 2016-04-05 17:02:24 +00:00
Rémy Coutable 9f33bf86cf Add 8.4.6 and 8.4.7 CHANGELOG items 
[ci skip]

Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-04-05 18:56:09 +02:00
Rémy Coutable c8d0f35502 Add 8.5.9 CHANGELOG item 
[ci skip]

Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-04-05 18:50:43 +02:00
Achilleas Pipinellis 59466a4780 Merge branch 'doc_ldap_fixes' into 'master' 
Fix LDAP link and codeblock indentation



See merge request !3538
 2016-04-05 14:37:40 +00:00
Achilleas Pipinellis 7b290e29f0 Fix LDAP link and codeblock indentation 
[ci skip]
 2016-04-05 17:04:16 +03:00
Yorick Peterse e1bc16cbdf Merge branch 'reorder-language' into 'master' 
Update language after doing all other operations

See merge request !3533
 2016-04-05 13:46:14 +00:00
Jacob Schatz 353365c7f2 Merge branch 'build-notification-changelog' into 'master' 
Added CHANGELOG for build notifications

[ci skip]

See merge request !3537
 2016-04-05 12:52:24 +00:00
Grzegorz Bizon bb9c194c23 Respond 404 when unauthorized user imports members 2016-04-05 14:37:06 +02:00
Phil Hughes f22e6515df Added CHANGELOG for build notifications 
[ci skip]
 2016-04-05 13:36:00 +01:00
Jacob Schatz 97747233a9 Merge branch 'scss-lint-comments' into 'master' 
Add comments to the SCSS Lint config file [ci skip]

This MR also adds some previously missing linters.

See merge request !3500
 2016-04-05 12:20:08 +00:00
Grzegorz Bizon c52b5c92fb Do not leak project exists when importing members 
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.
 2016-04-05 13:55:15 +02:00
Jacob Schatz 095386d600 Merge branch 'missing-changelog' into 'master' 
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
 2016-04-05 11:48:45 +00:00
Grzegorz Bizon b248ee9381 Check permissions when importing project members 
Closes #14899
 2016-04-05 13:32:28 +02:00
Kamil Trzcinski aad3b6ddf8 Update language only on HEAD of the repository 2016-04-05 11:08:41 +02:00
Kamil Trzcinski b8d1545bf1 Update language after doing all other operations 2016-04-05 10:54:34 +02:00
Yorick Peterse 8a0a802ee9 Merge branch 'fix-gh-pr-import' into 'master' 
Fix Importing repos from GHE doesn't work

See merge request !3529
 2016-04-05 08:17:47 +00:00
Robert Speicher 6bf4e9e752 Merge branch 'banzai-image-link' into 'master' 
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
 2016-04-05 03:52:31 +00:00
connorshea b9abf938ed Wrap images in discussions and wikis with a link to the image source using ImageLinkFilter. 
Resolves #14411.

See merge request !3464
 2016-04-04 19:44:07 -06:00
connorshea 21837bfb20 Add comments to the SCSS Lint config file [ci skip] 
Also add some previously missing linters.
 2016-04-04 17:48:24 -06:00
Jacob Schatz 6713600793 Merge branch 'remove-2fa-status' into 'master' 
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
 2016-04-04 23:14:04 +00:00
Douglas Barbosa Alexandre f2005fa566 Flush repository cache before import project data 
GitHub Pull Requests importer handle with the repository while
importing data, we need to make sure that the cached values are valid.
 2016-04-04 19:35:39 -03:00
Dmitriy Zaporozhets 8f9586421d Merge branch 'admin-pages-layout' into 'master' 
Improve UI for admin/groups page

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

cc @jschatz1 @skyruler 

See merge request !3523
 2016-04-04 22:25:06 +00:00
Dmitriy Zaporozhets 4b3747b2cf Add missing changelog item about improving navigation sidebar 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-04-04 23:56:15 +02:00
Dmitriy Zaporozhets be6f1c7427 Single quotes paradise 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-04-04 23:52:27 +02:00
Yorick Peterse a55fc41657 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2016-04-04 22:56:19 +02:00
Jacob Schatz 638012c23f Merge branch 'dz-admin-area-fixes' into 'master' 
Set of UI fixes for admin area



See merge request !3525
 2016-04-04 20:01:46 +00:00
Yorick Peterse b530cabd78 Merge branch 'fix-forked-project-link-specs' into 'master' 
Reload forked_project_link projects

See merge request !3526
 2016-04-04 19:57:48 +00:00
Jacob Schatz c653b1b488 Merge branch 'hide_profile_activity_on_mobile' into 'master' 
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
 2016-04-04 19:52:55 +00:00
Jacob Schatz 1926e55e1f Merge branch 'hide_profile_activity_on_mobile' into 'master' 
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
 2016-04-04 19:52:31 +00:00
Jacob Schatz 2fb0ef51d6 Merge branch 'fix-award-emoji-menu' into 'master' 
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
 2016-04-04 19:47:15 +00:00
Yorick Peterse 6e0f8453c0 Reload forked_project_link projects 
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.
 2016-04-04 21:05:51 +02:00
Jacob Schatz d5169a60d4 Merge branch '14083-build-labels' into 'master' 
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
 2016-04-04 18:29:40 +00:00
Dmitriy Zaporozhets f9fd003159 Fix missing paddings in admin area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-04-04 19:41:31 +02:00
Dmitriy Zaporozhets 3e6d27ee59 Dont use monospace font for names 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-04-04 19:36:21 +02:00
Dmitriy Zaporozhets 531e4bdac8 Merge branch 'fix-ui-event' into 'master' 
Fix event rendering when create project

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

cc @jschatz1 

See merge request !3522
 2016-04-04 17:32:30 +00:00
Dmitriy Zaporozhets d5fadfe0f5 Improve UI for admin/groups page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-04-04 19:23:50 +02:00
Dmitriy Zaporozhets 11c1dda35f Fix event rendering when create project 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-04-04 18:59:04 +02:00
Douwe Maan f505c753b0 Merge branch 'fix_remove_fork_link' into 'master' 
Remove fork link closes all merge requests opened on source project

Currently, if you:

- create a fork
- open a merge request on the source project
- remove the fork link

The created MR cannot be closed.

With this MR, all pending MR is closed when the fork link is removed.

See merge request !3189
 2016-04-04 15:37:08 +00:00
Dmitriy Zaporozhets 5e8740eef0 Merge branch 'fix-sidebar-exapnd' into 'master' 
Fix transparent bg for expand sidebar button

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

For #14838 

cc @jschatz1 

See merge request !3520
 2016-04-04 15:34:46 +00:00
Dmitriy Zaporozhets 1be3c634c8 Fix transparent bg for expand sidebar button 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-04-04 16:58:35 +02:00
Baldinof a6b5b50e14 Fix incorrect variable name 2016-04-04 14:41:01 +00:00
Douwe Maan ba7fcc9866 Merge branch 'update_repository_from_ee' into 'master' 
Migrate Repository#local_branches from gitlab-ee.

REF: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/249

This will help us to avoid posible merge conflicts when merging
gitlab-ce to gitlab-ee

See merge request !3496
 2016-04-04 14:25:15 +00:00
Jacob Schatz df77df46f5 Merge branch 'space-before-brace-scss-lint' into 'master' 
Enable SpaceBeforeBrace rule for SCSS Lint

Also resolve all instances of spaces not being included before opening braces.

See merge request !3463
 2016-04-04 13:56:10 +00:00
Rémy Coutable e014fe0426 Add 8.6.4 changelog item 
[ci skip]

Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-04-04 15:27:58 +02:00
Rémy Coutable 41c478cb8f Merge branch 'fix-mr-for-orphaned-branches' into 'master' 
Fix creation of merge requests for orphaned branches with images

When attempting to create a merge request from an orphaned branch (e.g. this happens for the first commit of any repo) that contained images, GitLab would fail with a Error 500. This MR fixes that problem.

Closes #14875

See merge request !3511
 2016-04-04 13:14:58 +00:00