summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'less-intrusive-system-note' into 'master' cherry-pick-596c305eFatih Acet2016-11-188-28/+153
* Merge branch 'feature/cycle-analytics-events' into 'master' Douwe Maan2016-11-1856-86/+1679
* Update VERSION to 8.14.0-rc3v8.14.0-rc3Alejandro Rodríguez2016-11-171-1/+1
* Merge branch 'master' into 8-14-stableAlejandro Rodríguez2016-11-16188-1155/+4245
|\
| * Merge branch 'fix-failing-user-without-projects-specs' into 'master' Sean McGivern2016-11-161-1/+1
| |\
| | * Fix some failing specs due to missing access_requestable traitNick Thomas2016-11-161-1/+1
| * | Merge branch '24496-fix-internal-api-project-lookup' into 'master' Sean McGivern2016-11-167-61/+126
| |\ \
| | * | Fix POST /internal/allowed to cope with gitlab-shell v4.0.0 project pathsNick Thomas2016-11-167-61/+126
| * | | Merge branch 'fix-shibboleth-auth-with-no-uid' into 'master' Rémy Coutable2016-11-162-0/+8
| |\ \ \ | | |_|/ | |/| |
| | * | fix shibboleth misconfigurations resulting in authentication bypassfix-shibboleth-auth-with-no-uidBrian Neel2016-11-142-0/+8
| * | | Merge branch 'patch-5' into 'master' Rémy Coutable2016-11-163-1/+24
| |\ \ \
| | * | | fix "Without projects" filterBen Bodenmiller2016-11-163-1/+24
| * | | | Merge branch '23824-activity-page-does-not-show-commits-comments' into 'master' Robert Speicher2016-11-164-5/+36
| |\ \ \ \
| | * | | | Allow commit note to be visible if repo is visible23824-activity-page-does-not-show-commits-commentsRémy Coutable2016-11-164-5/+36
| * | | | | Merge branch 'user-dropdown-multiple-requests-fix' into 'master' Fatih Acet2016-11-162-1/+5
| |\ \ \ \ \
| | * | | | | Stopped multiple requests with dropdownsuser-dropdown-multiple-requests-fixPhil Hughes2016-11-162-1/+5
| * | | | | | Merge branch 'issue-boards-counter-border-fix' into 'master' Fatih Acet2016-11-162-1/+5
| |\ \ \ \ \ \
| | * | | | | | Fixed issue boards counter border when unauthorizedissue-boards-counter-border-fixPhil Hughes2016-11-162-1/+5
| | |/ / / / /
| * | | | | | Merge branch 'adam-build-missing-services-when-necessary' into 'master' Douwe Maan2016-11-1611-54/+49
| |\ \ \ \ \ \
| | * | | | | | Defer saving project services to the database if there are no user changesadam-build-missing-services-when-necessaryAdam Niedzielski2016-11-1611-54/+49
| * | | | | | | Merge branch '23117-search-for-a-filename-in-a-project' into 'master' Sean McGivern2016-11-1611-83/+155
| |\ \ \ \ \ \ \
| | * | | | | | | Search for a filename in a project23117-search-for-a-filename-in-a-projectValery Sizov2016-11-1611-83/+155
| * | | | | | | | Merge branch '21992-disable-access-requests-by-default' into 'master' Robert Speicher2016-11-1627-78/+122
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Make access request specs explicitly enable or disable access requests as req...Nick Thomas2016-11-1124-76/+96
| | * | | | | | | | Set 'request_access_enabled' false by defaultChris Wilson2016-11-113-2/+26
| * | | | | | | | | Merge branch 'ux-guide-link-update-contributing' into 'master' Achilleas Pipinellis2016-11-161-4/+2
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | [ci skip] Fix UX Guide link on Contributing.mdux-guide-link-update-contributingawhildy2016-11-151-4/+2
| * | | | | | | | | | Merge branch 'move-snippet-discover-spinach-test-to-rspec' into 'master' Dmitriy Zaporozhets2016-11-163-34/+16
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Move 'Explore Snippets' Spinach feature to Rspecthe-undefined2016-11-083-34/+16
| * | | | | | | | | | | Merge branch 'fix-merge-request-screen-deleted-source-branch' into 'master' Sean McGivern2016-11-163-9/+26
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Do not create a MergeRequestDiff record when source branch is deletedfix-merge-request-screen-deleted-source-branchAdam Niedzielski2016-11-163-9/+26
| | | |_|_|/ / / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge branch 'rs-issue-24527' into 'master' Sean McGivern2016-11-163-25/+41
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Limit labels returned for a specific project as an administratorRobert Speicher2016-11-163-25/+41
| | | |_|_|_|_|_|_|/ / / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge branch 'setter-for-key' into 'master' Dmitriy Zaporozhets2016-11-163-9/+24
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |
| | * | | | | | | | | | Remove instance vars from key model testsSemyon Pupkov2016-11-161-6/+6
| | * | | | | | | | | | Use setter for key instead AR callbackSemyon Pupkov2016-11-163-3/+18
| * | | | | | | | | | | Merge branch 'fix_labels_api_adding_missing_parameter' into 'master' Sean McGivern2016-11-163-9/+51
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | add testsFrancesco Coda Zabetta2016-11-151-6/+21
| | * | | | | | | | | | | use Enumerable#find insted of select + firstFrancesco Coda Zabetta2016-11-151-3/+3
| | * | | | | | | | | | | fix changelog typosFrancesco Coda Zabetta2016-11-141-1/+1
| | * | | | | | | | | | | fix styleFrancesco Coda Zabetta2016-11-141-3/+3
| | * | | | | | | | | | | fix styleFrancesco Coda Zabetta2016-11-141-3/+3
| | * | | | | | | | | | | fix indentationFrancesco Coda Zabetta2016-11-141-7/+7
| | * | | | | | | | | | | add changelog entryFrancesco Coda Zabetta2016-11-141-0/+4
| | * | | | | | | | | | | fix labels API adding missing parameter (current_user)Francesco Coda Zabetta2016-11-142-9/+32
| * | | | | | | | | | | | Merge branch '24506-fix-timing-out-migration' into 'master' Yorick Peterse2016-11-161-23/+23
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Fix a badly-performing migrationNick Thomas2016-11-151-23/+23
| * | | | | | | | | | | | | Merge branch 'move-snippet-search-spinach-test-to-rspec' into 'master' Dmitriy Zaporozhets2016-11-164-86/+66
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Move 'Search Snippets' Spinach feature to Rspecthe-undefined2016-11-164-86/+66
| | | |_|_|/ / / / / / / / / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'doc/sentinel' into 'master' Achilleas Pipinellis2016-11-163-196/+1169
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | |