summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update commit status permissions [ci skip]commit-status-permission-updateKamil Trzcinski2016-02-231-0/+2
|
* Merge branch 'files-view-row-click' into 'master' Jacob Schatz2016-02-233-8/+7
|\ | | | | | | | | | | | | | | | | | | | | 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
| * Correctly checks if tree view is on screenPhil Hughes2016-02-232-2/+2
| |
| * Fixes issue with file view rows not clickable on project main viewfiles-view-row-clickPhil Hughes2016-02-233-8/+7
| | | | | | | | | | | | | | 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
* | Merge branch 'patch-1' into 'master' Rémy Coutable2016-02-231-13/+13
|\ \ | | | | | | | | | | | | | | | | | | fix some links See merge request !2812
| * | fix some linksnozo2016-02-141-13/+13
| | |
* | | Merge branch 'empty-repo-instructions-fix' into 'master' Jacob Schatz2016-02-236-2/+23
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | fix failing testsempty-repo-instructions-fixPhil Hughes2016-02-232-5/+1
| | | |
| * | | Users don't get instructions to push to other users empty projectsPhil Hughes2016-02-225-1/+26
| | | | | | | | | | | | | | | | Fixes #12518
* | | | Merge branch 'milestone-drag-empty-list' into 'master' Jacob Schatz2016-02-231-9/+21
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Issues can be dragged & dropped into empty milestone listsPhil Hughes2016-02-231-9/+21
| | |_|/ | |/| | | | | | | | | | | | | | | | | | This is also possible with MRs. Also fixed an issue where MRs weren't sortable Fixes #13668
* | | | Merge branch 'dashboard-misaligned-buttons' into 'master' Jacob Schatz2016-02-231-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Fixed mis-aligned buttons on dashboard/issuesdashboard-misaligned-buttonsPhil Hughes2016-02-231-0/+1
| |/ / /
* | | | Merge branch 'issue_11874' into 'master' Jacob Schatz2016-02-236-56/+127
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes dropdown appearance and makes it look accordingly to current design Fixes #11874 See merge request !2920
| * | | | Do not use calc and fix background spinner for high density displaysissue_11874Alfredo Sumaran2016-02-221-3/+5
| | | | |
| * | | | Use or create variablesAlfredo Sumaran2016-02-223-8/+9
| | | | |
| * | | | Simpler way to place arrowAlfredo Sumaran2016-02-221-3/+2
| | | | |
| * | | | Delete unused CSS ruleAlfredo Sumaran2016-02-221-7/+0
| | | | |
| * | | | Update dropdown menu styleAlfredo Sumaran2016-02-225-37/+85
| | | | |
| * | | | Make select2 design consistentAlfredo Sumaran2016-02-215-29/+57
| | | | |
* | | | | Merge branch 'ci/extend-summary-status-specs' into 'master' Kamil Trzciński2016-02-231-21/+51
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | Extend specs for summary build statusci/extend-summary-status-specsGrzegorz Bizon2016-02-201-21/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | Merge branch 'fix-autocomplete-spec' into 'master'Robert Speicher2016-02-231-1/+1
| |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix volatile spec. Fixes https://gitlab.com/gitlab-org/gitlab-ee/issues/312. See merge request !206
* | | | | Merge branch 'project-type-icon-your-projects' into 'master' Jacob Schatz2016-02-221-0/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | Show project visibility level on project listproject-type-icon-your-projectsPhil Hughes2016-02-221-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | Fixes #3779
* | | | | | Merge branch 'blame-line-link' into 'master' Jacob Schatz2016-02-223-4/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added line links to blame table Closes #4119 See merge request !2915
| * | | | | | Added line links to blame tableblame-line-linkPhil Hughes2016-02-223-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #4119
* | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqRobert Speicher2016-02-222-1/+1
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge pull request #10044 from qingyang1014/corrent-compare_branches-png-nameRobert Schilling2016-02-201-0/+0
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | correct compare_braches.png to /compare_branches.png
| | * | | | | | | correct compare_braches.png to /compare_branches.png and make sure it works ↵yuxiao.lxy2016-02-201-0/+0
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | in line 25 in add-merge-request.md
| * | | | | | | Merge pull request #10042 from sestus/masterRobert Schilling2016-02-191-1/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Typo fix in README.md of ci quick-start docs.
| | * | | | | | | Typo fix in README.mdMike Milonakis2016-02-181-1/+1
| | | | | | | | |
* | | | | | | | | Add missing word to GitLab Flow docRobert Speicher2016-02-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | Merge branch 'fix/13631-error-with-merged-mr' into 'master' Rémy Coutable2016-02-222-1/+35
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | Ensure we don't check a commit's description for revert message if it has no ↵Rémy Coutable2016-02-222-1/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | description
* | | | | | | | | | Merge branch 'saml-link-default' into 'master' Robert Speicher2016-02-221-0/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Properly set `auto_link_saml_user` default value in the Settings loader. See merge request !2922
| * | | | | | | | | | Properly set `auto_link_saml_user` default value in the Settings loader.Patricio Cano2016-02-221-0/+1
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'fix-moving-revert-button' into 'master' Jacob Schatz2016-02-221-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | Fixed revert button tooltip placement causing movementfix-moving-revert-buttonPhil Hughes2016-02-221-2/+2
| | |_|_|_|/ / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Make sure we recommend 2GBSytse Sijbrandij2016-02-221-2/+2
| |_|/ / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge branch 'status-indicator-size' into 'master' Jacob Schatz2016-02-221-6/+3
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | Changed the size of status indicatorsstatus-indicator-sizePhil Hughes2016-02-221-6/+3
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #12763
* | | | | | | | | | Merge branch 'header-overflow-small-devices' into 'master' Jacob Schatz2016-02-222-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | Fixed issue with header overflowheader-overflow-small-devicesPhil Hughes2016-02-222-1/+1
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #13492
* | | | | | | | | | Merge branch 'improve-merge-when-succeeded' into 'master' Douwe Maan2016-02-222-3/+25
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | Check the HEAD of branch when doing Merge When Succeededimprove-merge-when-succeededKamil Trzcinski2016-02-222-3/+25
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'rs-mask-icon' into 'master' Robert Speicher2016-02-221-0/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a Pinned Tab icon for Safari See http://apple.co/1SCRzrw Closes #13540 [ci skip] See merge request !2883
| * | | | | | | | | Add a Pinned Tab icon for Safarirs-mask-iconRobert Speicher2016-02-181-0/+1
| | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See http://apple.co/1SCRzrw Closes #13540 [ci skip]
* | | | | | | | | Merge branch 'issue-sidebar-content-scrolling' into 'master' Jacob Schatz2016-02-221-28/+23
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed issue with content in the issue sidebar disappearing Closes #13626 See merge request !2919
| * | | | | | | | Fixed issue with content in the issue sidebar disappearingissue-sidebar-content-scrollingPhil Hughes2016-02-221-28/+23
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Closes #13626