summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* Merge branch 'ci-duplication' into 'master' Achilleas Pipinellis2016-03-181-36/+1
* Merge branch 'improve-award-emoji-spinach-tests' into 'master' Robert Speicher2016-03-182-4/+11
* Merge branch 'issue_14374' into 'master' Robert Speicher2016-03-181-3/+4
* Merge branch 'fix_dropdown_getting_cut_off_in_page' into 'master' Jacob Schatz2016-03-181-0/+7
* Merge branch 'fix_issue_mr_page_inconsistency' into 'master' Jacob Schatz2016-03-182-13/+15
* Merge branch 'download-dropdown-alignment' into 'master' Jacob Schatz2016-03-182-1/+7
* Merge branch 'filter-spacing' into 'master' Jacob Schatz2016-03-181-14/+3
* Merge branch 'git-2-7-4' into 'master' Robert Speicher2016-03-183-6/+9
* Version 8.6.0-rc3v8.6.0-rc3Rémy Coutable2016-03-171-1/+1
* Merge branch 'edited-text' into 'master' Robert Speicher2016-03-176-18/+29
* Merge remote-tracking branch 'origin/master' into 8-6-stableRémy Coutable2016-03-1721-142/+444
|\
| * Merge branch 'blue-links-fix' into 'master' Jacob Schatz2016-03-171-4/+0
| |\
| | * Revert link color from blueblue-links-fixAlfredo Sumaran2016-03-171-4/+0
| * | Merge branch 'hide-builds-feature' into 'master' Robert Speicher2016-03-174-63/+76
| |\ \
| | * | Hide builds from Project's settings when the feature is disabledhide-builds-featureKamil Trzcinski2016-03-154-63/+76
| * | | Merge branch 'caching-project-avatars' into 'master' Robert Speicher2016-03-175-13/+120
| |\ \ \
| | * | | Cache project avatars stored in GitYorick Peterse2016-03-175-13/+120
| | | |/ | | |/|
| * | | Merge branch 'artem-forks/gitlab-ce-nginx-rel-url'Jacob Vosmaer2016-03-1710-58/+227
| |\ \ \
| | * | | Lets have CSS and logo inlineArtem Sidorenko2016-03-118-56/+208
| | * | | Do not serve anything via nginx as we have workhorseArtem Sidorenko2016-03-112-2/+19
| * | | | Merge branch 'dropdown-preselect-value' into 'master' Robert Speicher2016-03-172-4/+21
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Moved code to single line ifPhil Hughes2016-03-171-4/+2
| | * | | Removed label/milestone helper methodsdropdown-preselect-valuePhil Hughes2016-03-162-20/+10
| | * | | Fixed failing testsPhil Hughes2016-03-161-1/+2
| | * | | Pre-selects values on issue and merge request dropdownPhil Hughes2016-03-162-4/+32
* | | | | Merge remote-tracking branch 'origin/master' into 8-6-stableRémy Coutable2016-03-17113-662/+1229
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'glalonde-triggerbuild' into 'master' Kamil Trzciński2016-03-173-1/+25
| |\ \ \ \
| | * | | | added changelog entryGeoffrey Lalonde2016-03-171-0/+1
| | * | | | adjusted behavior so canceled builds tagged as allowed to fail do not fail buildGeoffrey Lalonde2016-03-172-1/+24
| * | | | | Merge branch 'rm_duplicate_cache_ci_docs' into 'master' Achilleas Pipinellis2016-03-171-62/+48
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'master' into rm_duplicate_cache_ci_docsAchilleas Pipinellis2016-03-17212-4709/+2860
| | |\ \ \ \ \
| | * | | | | | Merge duplicate cache entry in CI docsrm_duplicate_cache_ci_docsAchilleas Pipinellis2016-03-141-60/+48
| * | | | | | | Merge branch 'patch/refactor-post-receive' into 'master' Douwe Maan2016-03-172-27/+79
| |\ \ \ \ \ \ \
| | * | | | | | | Back-porting PostReceive refactor made for EE 🍺Gabriel Mazetto2016-03-172-27/+79
| * | | | | | | | Merge branch '4009-external-users' into 'master' Douwe Maan2016-03-1723-80/+265
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Add missing API docs on external userAchilleas Pipinellis2016-03-172-2/+3
| | * | | | | | | | API support for setting External flag on existing usersZeger-Jan van de Weg2016-03-172-1/+9
| | * | | | | | | | Refactor external users docsAchilleas Pipinellis2016-03-171-14/+18
| | * | | | | | | | Merge branch 'master' into 4009-external-users4009-external-usersZeger-Jan van de Weg2016-03-15134-4265/+2169
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Doc external users featureZeger-Jan van de Weg2016-03-154-2/+21
| | * | | | | | | | | Improve external users featureZeger-Jan van de Weg2016-03-144-6/+8
| | * | | | | | | | | Merge branch 'master' into 4009-external-usersZeger-Jan van de Weg2016-03-1468-91/+964
| | |\ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / | | | |/| | | | | | |
| | * | | | | | | | | Create an external users tab on Admin user listZeger-Jan van de Weg2016-03-138-8/+57
| | * | | | | | | | | Remove Project#publicishZeger-Jan van de Weg2016-03-132-8/+2
| | * | | | | | | | | External UsersZeger-Jan van de Weg2016-03-1315-60/+171
| * | | | | | | | | | Merge branch 'new-branch-button-issue' into 'master' Douwe Maan2016-03-1715-43/+238
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fix specsZeger-Jan van de Weg2016-03-172-1/+2
| | * | | | | | | | | | Merge branch 'master' into new-branch-button-issueZeger-Jan van de Weg2016-03-1789-448/+697
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / | | | |/| | | | | | | |
| | * | | | | | | | | | Incorporate the review and update specZeger-Jan van de Weg2016-03-155-21/+20
| | * | | | | | | | | | Incorporate reviewZeger-Jan van de Weg2016-03-1510-27/+93