home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 07:36:41 +10:00
Code Issues Packages Projects Releases Wiki Activity
24,318 Commits 48 Branches 340 Tags
2f63303fdb3cc7c4e7aedea0eb4178a2d9b6b463
Commit Graph
24318 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Alfredo Sumaran 2f63303fdb Add "e" shortcut to help modal 2016-02-23 11:54:56 -05:00
Alfredo Sumaran 8129d1675f Add "e" shortcut to edit issuable 2016-02-23 11:28:23 -05:00
Jacob Schatz 1142b327e8 Merge branch 'dz-small-ui-fixes' into 'master' 
Set of UI fixes

* Improve wiki pages
* Improve profile pages

cc @skyruler 

See merge request !2758
 2016-02-23 15:38:20 +00:00
Marin Jankovski f317d5fcb9 Merge branch 'uploads-700' into 'master' 
Restrict permissions on public/uploads

Based on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/631

See merge request !2764
 2016-02-23 15:12:20 +00:00
Jacob Schatz 6263a3ca3c Merge branch 'files-view-row-click' into 'master' 
Fixes issue with file view rows not clickable on project main view

Fixed an issue where it would only load the first 25 commit data on project main view.

Stopped the file view sending 1 too many requests.

Fixes #3916

See merge request !2933
 2016-02-23 14:52:21 +00:00
Rémy Coutable 1ff17b6bba Merge branch 'patch-1' into 'master' 
fix some links



See merge request !2812
 2016-02-23 14:33:47 +00:00
Jacob Schatz 06f7fd2fb7 Merge branch 'empty-repo-instructions-fix' into 'master' 
Users don't get instructions to push to other users empty projects

Fixes #12518

![Screen_Shot_2016-02-22_at_17.38.18](/uploads/42a3c32af1326f15a7b40fd7153a89fb/Screen_Shot_2016-02-22_at_17.38.18.png)

See merge request !2923
 2016-02-23 14:07:36 +00:00
Phil Hughes 01b965f6da Correctly checks if tree view is on screen 2016-02-23 13:41:03 +00:00
Jacob Schatz f5be56710f Merge branch 'milestone-drag-empty-list' into 'master' 
Issues can be dragged & dropped into empty milestone lists

This is also possible with MRs. Also fixed an issue where MRs weren't sortable

Fixes #13668

![milestone](/uploads/aada0f48ce8b1407cce920eef3f4d5f3/milestone.gif)

See merge request !2935
 2016-02-23 12:39:39 +00:00
Jacob Schatz 7819420fd4 Merge branch 'dashboard-misaligned-buttons' into 'master' 
Fixed mis-aligned buttons on dashboard/issues

Before:

![](/uploads/35e413f2a5273bcdb1cc9ab20fa8d923/Screen_Shot_2016-02-22_at_10.15.39_PM.png)

After:

![Screen_Shot_2016-02-23_at_08.45.12](/uploads/4fbba0650ea6005b1cd600b5038f91d1/Screen_Shot_2016-02-23_at_08.45.12.png)


See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2921#note_3868715

See merge request !2932
 2016-02-23 12:16:25 +00:00
Jacob Schatz b323e4dcf1 Merge branch 'issue_11874' into 'master' 
Fixes dropdown appearance and makes it look accordingly to current design

Fixes #11874

See merge request !2920
 2016-02-23 12:07:14 +00:00
Phil Hughes 4eb67cdf42 Issues can be dragged & dropped into empty milestone lists 
This is also possible with MRs. Also fixed an issue where MRs weren't sortable

Fixes #13668
 2016-02-23 10:44:27 +00:00
Kamil Trzciński 884094a77e Merge branch 'ci/extend-summary-status-specs' into 'master' 
Extend specs for summary build status

Additional specs cover a case when one of the builds is running but
allowed to fail. Previous implementation returned `running` status,
which is wrong. This behavior has been changed in 8.5, this commit adds
missing specs.

See merge request !2904
 2016-02-23 10:07:55 +00:00
Robert SpeicherandRémy Coutable e6195b859f Merge branch 'fix-autocomplete-spec' into 'master' 
Fix volatile spec.

Fixes https://gitlab.com/gitlab-org/gitlab-ee/issues/312.

See merge request !206
 2016-02-23 10:11:39 +01:00
Phil Hughes d80205b755 Fixes issue with file view rows not clickable on project main view 
Fixed an issue where it would only load the first 25 commit data on project main view
Stopped the file view sending 1 too many requests

Fixes #3916
 2016-02-23 09:06:26 +00:00
Phil Hughes ef82e90c4b Fixed mis-aligned buttons on dashboard/issues 2016-02-23 08:44:18 +00:00
Phil Hughes 3ec1bffc6c fix failing tests 2016-02-23 08:42:29 +00:00
Alfredo Sumaran 8f5e1b9fb5 Do not use calc and fix background spinner for high density displays 2016-02-22 16:46:33 -05:00
Jacob Schatz 7c80998536 Merge branch 'project-type-icon-your-projects' into 'master' 
Show project visibility level on project list

Fixes #3779

![Screen_Shot_2016-02-22_at_10.08.58](/uploads/611cc8aa2d12591d4fe6a70ba0f45d68/Screen_Shot_2016-02-22_at_10.08.58.png)

See merge request !2908
 2016-02-22 20:34:31 +00:00
Jacob Schatz 54a5b8831a Merge branch 'blame-line-link' into 'master' 
Added line links to blame table

Closes #4119

See merge request !2915
 2016-02-22 20:29:38 +00:00
Robert Speicher d10b43dae3 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2016-02-22 15:24:20 -05:00
Robert Speicher 9871612d50 Add missing word to GitLab Flow doc 
[ci skip]
 2016-02-22 15:23:11 -05:00
Rémy Coutable 493d166d66 Merge branch 'fix/13631-error-with-merged-mr' into 'master' 
Ensure we don't check a commit's description for revert message if it has no description

Fixes #13631.

/cc @razer6 @grzesiek @yorickpeterse @rdavila 

See merge request !2917
 2016-02-22 18:13:46 +00:00
Alfredo Sumaran 80fbb8af7c Use or create variables 2016-02-22 12:59:32 -05:00
Robert Speicher 7479f0602e Merge branch 'saml-link-default' into 'master' 
Properly set `auto_link_saml_user` default value in the Settings loader.

See merge request !2922
 2016-02-22 17:48:23 +00:00
Jacob Schatz 81e5c9c289 Merge branch 'fix-moving-revert-button' into 'master' 
Fixed revert button tooltip placement causing movement

Before:

![moving-tooltip](/uploads/65cb9a41e8b8114fd8ee10d68cfd8206/moving-tooltip.gif)

After:

![moving-tooltip](/uploads/a1c36eb5735dc7592c49f6b5cb1469b5/moving-tooltip.gif)

See merge request !2910
 2016-02-22 17:37:34 +00:00
Phil Hughes 62f4a9de19 Users don't get instructions to push to other users empty projects 
Fixes #12518
 2016-02-22 17:37:26 +00:00
Sytse Sijbrandij b31c68aa2a Make sure we recommend 2GB 2016-02-22 17:35:18 +00:00
Rémy Coutable 96ed5c5114 Ensure we don't check a commit's description for revert message if it has no description 2016-02-22 18:33:02 +01:00
Alfredo Sumaran 9c185c4361 Simpler way to place arrow 2016-02-22 12:16:42 -05:00
Jacob Schatz 96ce80d578 Merge branch 'status-indicator-size' into 'master' 
Changed the size of status indicators

![Screen_Shot_2016-02-22_at_12.53.25](/uploads/229593bf76a78a2ce658c565d805716a/Screen_Shot_2016-02-22_at_12.53.25.png)

![Screen_Shot_2016-02-22_at_12.53.36](/uploads/d328809a3288943a47bed2cf13611a03/Screen_Shot_2016-02-22_at_12.53.36.png)

Closes #12763

See merge request !2913
 2016-02-22 17:06:40 +00:00
Jacob Schatz 6fb523d2bf Merge branch 'header-overflow-small-devices' into 'master' 
Fixed issue with header overflow

Fixes #13492

Before:

![Screen_Shot_2016-02-22_at_15.32.42](/uploads/aefec4e67368d0387f22448be8eea65c/Screen_Shot_2016-02-22_at_15.32.42.png)

After:

![Screen_Shot_2016-02-22_at_15.32.09](/uploads/76b0d96cd5d9a4076c9d0883aaaba003/Screen_Shot_2016-02-22_at_15.32.09.png)

See merge request !2921
 2016-02-22 17:00:43 +00:00
Patricio Cano 99edb2a0aa Properly set auto_link_saml_user default value in the Settings loader. 2016-02-22 11:59:15 -05:00
Douwe Maan df1cdefe88 Merge branch 'improve-merge-when-succeeded' into 'master' 
Check the HEAD of branch when doing Merge When Succeeded

Implements https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2894#note_3845158

cc @DouweM @grzesiek 


See merge request !2907
 2016-02-22 16:51:04 +00:00
Robert Speicher 8c4cfb1fee Merge branch 'rs-mask-icon' into 'master' 
Add a Pinned Tab icon for Safari

See http://apple.co/1SCRzrw

Closes #13540

[ci skip]

See merge request !2883
 2016-02-22 16:34:46 +00:00
Jacob Schatz 1ab5eb93eb Merge branch 'issue-sidebar-content-scrolling' into 'master' 
Fixed issue with content in the issue sidebar disappearing

Closes #13626

See merge request !2919
 2016-02-22 16:26:30 +00:00
Alfredo Sumaran de3cdcfcd6 Delete unused CSS rule 2016-02-22 10:53:04 -05:00
Phil Hughes 7f1c26cfee Fixed issue with header overflow 
Fixes #13492
 2016-02-22 15:31:19 +00:00
Phil Hughes d14889c294 Fixed issue with content in the issue sidebar disappearing 
Closes #13626
 2016-02-22 14:58:25 +00:00
Alfredo Sumaran 983dbe2aaa Update dropdown menu style 2016-02-22 09:58:04 -05:00
Jacob Schatz 5803a5308f Merge branch 'issue_13463' into 'master' 
Fix Side-by-side view after loading diff results

Fixes #13463

See merge request !2880
 2016-02-22 14:35:06 +00:00
Phil Hughes 416b49d3f0 Changed the size of status indicators 
Closes #12763
 2016-02-22 14:11:41 +00:00
Phil Hughes fbc578a7ec Added line links to blame table 
Closes #4119
 2016-02-22 14:09:13 +00:00
Phil Hughes aa1ac6368e Fixed revert button tooltip placement causing movement 2016-02-22 12:55:28 +00:00
Achilleas Pipinellis f51d8af5a7 Merge branch 'add_missing_doc' into 'master' 
Add when the API changes got introduced



See merge request !2912
 2016-02-22 12:34:41 +00:00
Achilleas Pipinellis 13fd08b157 Add when the API changes got introduced 
[ci skip]
 2016-02-22 14:30:22 +02:00
Rémy Coutable 4c3c67a71e Merge branch 'fix-failing-issue-tests' into 'master' 
Fixed failing issues tests

Also removed up/down vote icons from merge requests. Was missed from d8069bd858

See merge request !2911
 2016-02-22 12:23:08 +00:00
Phil Hughes 7bdddb481d removed merge-request-no-votes css class 2016-02-22 11:50:26 +00:00
Rémy Coutable a612ac1cb4 Update CHANGELOG and VERSION for 8.6.0-pre 2016-02-22 12:41:13 +01:00
Phil Hughes 51c17329a4 Fixed failing issues tests 
Removed up/down vote icons from merge requests. Was missed from d8069bd858
 2016-02-22 11:35:52 +00:00