home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-22 19:16:39 +10:00
Code Issues Packages Projects Releases Wiki Activity
26,187 Commits 48 Branches 340 Tags
507cbca339444eabdfdd5d6dff1237bd00ee636a
Commit Graph
13522 Commits
Author SHA1 Message Date
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
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
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
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 be6f1c7427 Single quotes paradise 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-04-04 23:52:27 +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
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
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 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 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
Stan Hu 7877138958 Fix creation of merge requests for orphaned branches 
Closes #14875
 2016-04-04 04:51:05 -07:00
Yorick Peterse 3dd91f55a0 Merge branch 'issue_14853' into 'master' 
Fix bug related to filtering Issues by Label/Milestone.

See merge request !3499
 2016-04-04 09:05:57 +00:00
Douwe Maan fee7ad8627 Merge branch 'build-updates' into 'master' 
Build updates

Fixes #10851 

![build-updates](/uploads/52e09e679ca457f3d818f9a12fd8382b/build-updates.gif)


See merge request !2604
 2016-04-03 13:22:27 +00:00
Douwe Maan 136267dd35 Merge branch 'fix-bad-fetch' into 'master' 
Don't fetch any tags from a forked repo

Closes #13957

See merge request !3504
 2016-04-03 12:17:43 +00:00
Rubén Dávila fd090a2fab Fix bug related to filtering Issues by Label/Milestone. 
This problem only was affecting the dev env.
 2016-04-02 07:36:41 -05:00
Dmitriy Zaporozhets 2ed6cd9e46 Merge branch 'new-navigation-prototype' into 'master' 
Two level hierarchy  in navigation sidebar

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

See merge request !3494
 2016-04-02 10:20:17 +00:00
Dmitriy Zaporozhets 31b27adeb8 Fix milestones tab active state and tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-04-02 11:26:46 +02:00
Stan Hu b43e059748 Don't fetch any tags from a forked repo 
Closes #13957
 2016-04-02 00:45:07 -07:00
Dmitriy Zaporozhets 847940516b Fix some active tab tests that are broken because of 2 level sidebar 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-04-01 22:35:49 +02:00
Jacob Schatz 13659fe7b6 Merge branch 'dz-fix-nav-block' into 'master' 
Remove 1px whitespace between nav tabs and underline when form present

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

See merge request !3489
 2016-04-01 20:33:29 +00:00
Rubén Dávila e6b5716785 Migrate Repository#local_branches from gitlab-ee. 
This will help us to avoid posible merge conflicts when merging
gitlab-ce to gitlab-ee
 2016-04-01 14:21:08 -05:00
Dmitriy Zaporozhets 4a8bd9faaf Some tweaks to new sidebar 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-04-01 20:34:42 +02:00
Jacob Schatz 09b7b766cb Merge branch 'notes-actions-colours' into 'master' 
Notes/discussions header

Part way towards getting the design for issues/merge requests to look more like the design in #3401 - I have standardised the headers for both issues & merge requests comments and discussions.

See merge request !3441
 2016-04-01 18:22:14 +00:00
Dmitriy Zaporozhets de6360f904 Improve styling for new complex sidebar 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-04-01 19:51:18 +02:00
Dmitriy Zaporozhets 03f2dd90ec Hide sidebar completely when collapsed 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-04-01 19:32:39 +02:00
Robert Speicher 5627542fd4 Merge branch 'routing' into 'master' 
Added & use Gitlab::Routing for URL helpers

Extracted from !3389

See merge request !3486
 2016-04-01 16:51:20 +00:00
Robert Speicher c8038dc243 Merge branch 'memoize-pattern-methods' into 'master' 
Memoize reference_pattern/link_reference_pattern

Extracted from !3389

See merge request !3485
 2016-04-01 16:49:50 +00:00
Dmitriy Zaporozhets dbc96f05d0 Refactor left navigation sidebar to use 2 levels 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-04-01 18:24:03 +02:00
Dmitriy Zaporozhets 18dd525d0f Concept of 2 level navigation sidebar 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-04-01 16:58:28 +02:00
Jacob Schatz a4f55888df Merge branch 'revert-e3f0bef5' into 'master' 
Revert "Merge branch 'users_should_not_be_able_upvote_downvote' into 'master'"

This reverts merge request !3406

See merge request !3491
 2016-04-01 14:56:01 +00:00
Sandra Freihofer bb2214bd64 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.
 2016-04-01 16:20:29 +02:00
Rémy Coutable f9ab215b21 Merge branch 'error-when-ldap-doesn-t-supply-an-email-address-14559' into 'master' 
Allow temp-oauth-email as notification email

Closes #14559 

/cc @dblessing @rymai 

See merge request !3477
 2016-04-01 14:12:42 +00:00
Jacob Schatz 9f27b852af Revert "Merge branch 'users_should_not_be_able_upvote_downvote' into 'master' " 
This reverts merge request !3406
 2016-04-01 14:05:16 +00:00
Annabel Dunstone cd4f3da750 Add labels to block element 2016-04-01 09:01:44 -05:00
Jacob Schatz e3f0bef5ee Merge branch 'users_should_not_be_able_upvote_downvote' into 'master' 
Prevent users from being able to both upvote and downvote

closes #14480 

![thumbs](/uploads/d0d64f08dbf271fe969b44c68f424123/thumbs.gif)

See merge request !3406
 2016-04-01 13:59:08 +00:00
Jacob Schatz 71d0ef5bd7 Merge branch 'fix_divider_in_dropdown_when_not_needed' into 'master' 
Fix divider in dropdown when not needed

closes #14533
## Before
![Screen_Shot_2016-03-25_at_12.35.21_AM](/uploads/20f386c9c45c9ee8716835ccfa0066ed/Screen_Shot_2016-03-25_at_12.35.21_AM.png)

## After
![Screen_Shot_2016-03-25_at_12.37.27_AM](/uploads/22db62db920017da5fe1da7670fbbb0e/Screen_Shot_2016-03-25_at_12.37.27_AM.png)

See merge request !3394
 2016-04-01 13:57:48 +00:00