summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Added specs for the various Repository hooksrepository-caching-refactorYorick Peterse2016-02-251-2/+106
|
* Moved exists condition in Repository#before_deleteYorick Peterse2016-02-251-6/+4
| | | | | This is only needed when calling the "expire_cache" method as the other expiration methods don't depend on Git data.
* Move Repository#expire_all_caches to before_deleteYorick Peterse2016-02-231-10/+5
|
* Moved cache expiration code to Repository hooksYorick Peterse2016-02-237-14/+47
| | | | | This keeps all the cache expiration code in a single file/class instead of spreading it all across the codebase.
* 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
* | | | | | | Merge branch 'issue_13463' into 'master' Jacob Schatz2016-02-223-1/+10
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Side-by-side view after loading diff results Fixes #13463 See merge request !2880
| * | | | | | Update button selectorissue_13463Alfredo Sumaran2016-02-191-1/+1
| | | | | | |
| * | | | | | Fixes syntax errorAlfredo Sumaran2016-02-191-1/+1
| | | | | | |
| * | | | | | Change method name for consistencyAlfredo Sumaran2016-02-191-2/+2
| | | | | | |
| * | | | | | Make diff view name getter less error proneAlfredo Sumaran2016-02-192-5/+3
| | | | | | |
| * | | | | | Add commentAlfredo Sumaran2016-02-191-0/+2
| | | | | | |
| * | | | | | Add missing class to builds pageAlfredo Sumaran2016-02-181-0/+1
| | | | | | |
| * | | | | | Expand view container if diff mode is set to paralellsAlfredo Sumaran2016-02-181-0/+8
| | | | | | |
* | | | | | | Merge branch 'add_missing_doc' into 'master' Achilleas Pipinellis2016-02-222-0/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add when the API changes got introduced See merge request !2912
| * | | | | | | Add when the API changes got introducedAchilleas Pipinellis2016-02-222-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | Merge branch 'fix-failing-issue-tests' into 'master' Rémy Coutable2016-02-224-17/+7
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed failing issues tests Also removed up/down vote icons from merge requests. Was missed from d8069bd85863ab8c47d2bb2370221b17fb686b93 See merge request !2911
| * | | | | | | removed merge-request-no-votes css classPhil Hughes2016-02-221-3/+1
| | | | | | | |
| * | | | | | | Fixed failing issues testsPhil Hughes2016-02-223-14/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed up/down vote icons from merge requests. Was missed from d8069bd85863ab8c47d2bb2370221b17fb686b93
* | | | | | | | Update CHANGELOG and VERSION for 8.6.0-preRémy Coutable2016-02-222-2/+4
|/ / / / / / /
* | | | | | | Merge branch 'fix-zero-votes-showing-on-issue-list' into 'master' Rémy Coutable2016-02-222-11/+3
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only show up or down votes icon on issue list if there are any Closes #13649 ![Screen_Shot_2016-02-22_at_10.20.27](/uploads/21477426856dab9731bb110032025867/Screen_Shot_2016-02-22_at_10.20.27.png) See merge request !2909
| * | | | | | Only show up or down votes icon on issue list if there are anyPhil Hughes2016-02-222-11/+3
|/ / / / / / | | | | | | | | | | | | | | | | | | Closes #13649