summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Ground work for Kubernetes config files dropdownzj-kubernetes-config-templatesZ.J. van de Weg2016-09-283-3/+32
* Merge branch '22681-avoid-empty-queries-on-reference-parsers' into 'master' Yorick Peterse2016-09-282-1/+6
|\
| * Avoid database queries on Banzai::ReferenceParser::BaseParser for nodes witho...22681-avoid-empty-queries-on-reference-parsersPaco Guzman2016-09-282-1/+6
* | Merge branch 'bbodenmiller/gitlab-ce-patch-2' into 'master' Rémy Coutable2016-09-281-0/+10
|\ \
| * | Add footnote to Markdown docsBen Bodenmiller2016-09-281-0/+10
* | | Merge branch 'zj-bundle-quiet-mode' into 'master' Robert Speicher2016-09-281-1/+1
|\ \ \ | |/ / |/| |
| * | Reduce output to the build logzj-bundle-quiet-modeZ.J. van de Weg2016-09-281-1/+1
* | | Merge branch 'hvlad/gitlab-ce-feature/add_test_for_git_http_ldap_user' into '...Rémy Coutable2016-09-282-324/+381
|\ \ \ | |_|/ |/| |
| * | Added git http requests tests for user with LDAP identityHoratiu Eugen Vlad2016-09-282-324/+381
* | | Merge branch 'siemens/gitlab-ce-fix/ldap-access-errors' into 'master' Rémy Coutable2016-09-285-5/+44
|\ \ \ | |_|/ |/| |
| * | Log LDAP lookup errors and don't swallow unrelated exceptionsMarkus Koller2016-09-285-5/+44
| |/
* | Merge branch 'glensc/gitlab-ce-ruby-prof-0.16' into 'master' Rémy Coutable2016-09-283-3/+4
|\ \ | |/ |/|
| * Bump ruby prof to 0.16Elan Ruusamäe2016-09-283-3/+4
|/
* Merge branch 'is-v-cloak-causing-master-to-fail-pls-no-why' into 'master' Jacob Schatz2016-09-281-1/+1
|\
| * Remove test for Ruby 2.1.Jacob Schatz2016-09-271-2/+2
| * Run Ruby 2.1 tests on non-master branches too.is-v-cloak-causing-master-to-fail-pls-no-whyConnor Shea2016-09-271-2/+2
| * Changed to hash rocket and string 'true'Luke Bennett2016-09-271-1/+1
|/
* Merge branch 'label-update-check-new' into 'master' Jacob Schatz2016-09-274-8/+35
|\
| * Send ajax request for label update only if they are changed (#19472 !5071)label-update-check-newPhil Hughes2016-09-274-8/+35
* | Merge branch 'fix/optimize-github-importer-for-speed-and-memory' into 'master' Yorick Peterse2016-09-275-78/+87
|\ \
| * | Call after_remove_branch only once after importing all GitHub PRsfix/optimize-github-importer-for-speed-and-memoryAhmad Sherif2016-09-272-2/+3
| * | Import all GitHub comments after importing issues and PRsAhmad Sherif2016-09-272-12/+17
| * | Speed up label-applying process for GitHub importingAhmad Sherif2016-09-272-14/+15
| * | Process each page of GitHub resources instead of concating them then processingAhmad Sherif2016-09-273-56/+58
* | | Merge branch '22472-wrong-table-head' into 'master' Fatih Acet2016-09-271-7/+1
|\ \ \
| * | | Removed stages loop for a single 'Stages' header22472-wrong-table-headLuke Bennett2016-09-271-7/+1
* | | | Merge branch 'includes-projects-to-render-issue-notes' into 'master' Yorick Peterse2016-09-272-1/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix IssuesController#show degradation including project on loaded notesincludes-projects-to-render-issue-notesPaco Guzman2016-09-272-1/+2
| | |/ | |/|
* | | Merge branch 'add-calendar-tests' into 'master' Jacob Schatz2016-09-272-9/+101
|\ \ \
| * | | Add more tests for calendar contributionClement Ho2016-09-262-9/+101
* | | | Merge branch '22053-bump-gitlab-shell-to-have-git-trace' into 'master' Rémy Coutable2016-09-272-1/+2
|\ \ \ \
| * | | | Use gitlab-shell v3.6.2 (GIT TRACE logging)22053-bump-gitlab-shell-to-have-git-tracePaco Guzman2016-09-262-1/+2
* | | | | Merge branch 'be-nice-to-docker-client' into 'master' Rémy Coutable2016-09-274-9/+28
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Be nice to Docker Clients talking to JWT/authKamil Trzcinski2016-09-274-9/+28
|/ / / /
* | | | Merge branch 'issue-boards-label-filter-fix' into 'master' Fatih Acet2016-09-273-3/+27
|\ \ \ \
| * | | | Tests fixissue-boards-label-filter-fixPhil Hughes2016-09-071-0/+2
| * | | | tests updatePhil Hughes2016-09-071-0/+2
| * | | | Fixed issue board label filtering not removing labelsPhil Hughes2016-09-073-3/+23
* | | | | Merge branch 'fix/import-new-models-error' into 'master' Rémy Coutable2016-09-275-5/+54
|\ \ \ \ \
| * | | | | fix model order in import/export config and 1to1 relation issue. Added releva...James Lopez2016-09-275-5/+54
|/ / / / /
* | | | | Merge branch 'rs-merge_commit_message' into 'master' doc-setup-sshRobert Speicher2016-09-272-7/+41
|\ \ \ \ \
| * | | | | Improve how MergeCommit#merge_commit_message builds the messageRobert Speicher2016-09-272-7/+41
* | | | | | Merge branch 'dz-profile-organization' into 'master' Dmitriy Zaporozhets2016-09-2711-7/+49
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Add extra check for api users specDmitriy Zaporozhets2016-09-271-0/+1
| * | | | | Improvements to user organization field feature after code reviewDmitriy Zaporozhets2016-09-272-17/+1
| * | | | | Add User#organization to users apiDmitriy Zaporozhets2016-09-274-4/+20
| * | | | | Dispaly organization name at user pageDmitriy Zaporozhets2016-09-271-1/+5
| * | | | | Add organization field to user profileDmitriy Zaporozhets2016-09-276-2/+39
* | | | | | Merge branch 'rc-new-members-approve-request-access-service' into 'master' Douwe Maan2016-09-275-13/+131
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Inverse condition in Members::ApproveAccessRequestServicerc-new-members-approve-request-access-serviceRémy Coutable2016-09-221-3/+3
View Lorry Controller Status