| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Allow HTTP(s) when build authentication_abilities are present44389-always-allow-http-for-ci-git-operations | Tomasz Maczukin | 2018-03-27 | 1 | -0/+2 |
| | | |||||
| * | Merge branch 'reduce-query-count-for-mergerequestscontroller-show' into 'master' | Douwe Maan | 2018-03-27 | 3 | -10/+33 |
| |\ | | | | | | | | | Fix N+1 in `MergeRequest#merge_request_diff_for` See merge request gitlab-org/gitlab-ce!17908 | ||||
| | * | Fix N+1 in `MergeRequest#merge_request_diff_for`reduce-query-count-for-mergerequestscontroller-show | Sean McGivern | 2018-03-21 | 3 | -10/+33 |
| | | | | | | | | | | | | | | | | | | | Previously, this would issue a query for each unique `diff_refs_or_sha` passed. This was because we didn't want to load other MR diffs into memory, as they had some very large columns. Now they are actually very small, and it's more efficient to just load them all at once and do the finding in Ruby. | ||||
| * | | Merge branch 'remove-source-branch-docs' into 'master' | Achilleas Pipinellis | 2018-03-27 | 2 | -0/+16 |
| |\ \ | | | | | | | | | | | | | Added docs for removing source branch See merge request gitlab-org/gitlab-ce!17879 | ||||
| | * | | Added docs for removing source branch | Phil Hughes | 2018-03-27 | 2 | -0/+16 |
| |/ / | |||||
| * | | Merge branch 'docs-ee-5105-split_dependency_scanning_from_sast' into 'master' | Achilleas Pipinellis | 2018-03-27 | 2 | -2/+20 |
| |\ \ | | | | | | | | | | | | | Add documentation for Dependency Scanning feature See merge request gitlab-org/gitlab-ce!17893 | ||||
| | * | | Add documentation for Dependency Scanning feature | Olivier Gonzalez | 2018-03-27 | 2 | -2/+20 |
| |/ / | |||||
| * | | Merge branch 'docs-ci-docker-build-cache' into 'master' | Achilleas Pipinellis | 2018-03-27 | 1 | -15/+76 |
| |\ \ | | | | | | | | | | | | | Add Docker layer caching to CI docker-in-docker docs See merge request gitlab-org/gitlab-ce!17741 | ||||
| | * | | Add Docker layer caching to CI docker-in-docker docs | Athar Hameed | 2018-03-27 | 1 | -15/+76 |
| |/ / | |||||
| * | | Merge branch 'jej/add-protected-branch-policy' into 'master' | Nick Thomas | 2018-03-27 | 16 | -22/+281 |
| |\ \ | | | | | | | | | | | | | Add protected branch policy See merge request gitlab-org/gitlab-ce!17982 | ||||
| | * | | Revert exploratory branch restriction policyjej/add-protected-branch-policy | James Edwards-Jones | 2018-03-26 | 2 | -54/+6 |
| | | | | |||||
| | * | | API uses ProtectedBranchPolicy for destroy/create | James Edwards-Jones | 2018-03-26 | 2 | -4/+35 |
| | | | | |||||
| | * | | ProtectedBranchPolicy used from Controller for destroy/update | James Edwards-Jones | 2018-03-26 | 7 | -4/+97 |
| | | | | |||||
| | * | | DestroyService for protected tags/branches used from controller | James Edwards-Jones | 2018-03-26 | 9 | -14/+122 |
| | | | | |||||
| | * | | Branch unprotection restriction starting point | James Edwards-Jones | 2018-03-26 | 3 | -1/+76 |
| | | | | | | | | | | | | | Explored Policy framework to create something I can use as a starting point. | ||||
| * | | | Merge branch 'ab-44467-remove-index' into 'master' | Yorick Peterse | 2018-03-27 | 3 | -2/+24 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused index from events table. Closes #44467 See merge request gitlab-org/gitlab-ce!18014 | ||||
| | * | | | Remove unused index from events table. | Andreas Brandl | 2018-03-27 | 3 | -2/+24 |
| | | | | | | | | | | | | | | | | | Closes #44467. | ||||
| * | | | | Merge branch 'update-docs-mr-template' into 'master' | Marcia Ramos | 2018-03-27 | 1 | -7/+20 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Update the Documentation MR template See merge request gitlab-org/gitlab-ce!18011 | ||||
| | * | | | | Update the Documentation MR templateupdate-docs-mr-template | Achilleas Pipinellis | 2018-03-27 | 1 | -7/+20 |
| | | | | | | | | | | | | | | | | | | | | | [ci skip] | ||||
| * | | | | | Merge branch 'ide-ui-theme' into 'master' | Tim Zallmann | 2018-03-27 | 2 | -34/+93 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added web IDE to GitLab theme definition Closes #44571 See merge request gitlab-org/gitlab-ce!17963 | ||||
| | * | | | | | Added web IDE to GitLab theme definitionide-ui-theme | Phil Hughes | 2018-03-23 | 2 | -34/+93 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Closes #44571 | ||||
| * | | | | | | Merge branch 'sh-add-fsevents-dev-dependency' into 'master' | Mike Greiling | 2018-03-27 | 2 | -1/+4 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add fsevents as an optional dependency to avoid Webpack killing the CPU Closes #33886 See merge request gitlab-org/gitlab-ce!17971 | ||||
| | * | | | | | | Install fsevents as an optional dependency in package.jsonsh-add-fsevents-dev-dependency | Stan Hu | 2018-03-25 | 2 | -1/+4 |
| | | | | | | | | |||||
| | * | | | | | | Revert "Add fsevents as a dev dependency to avoid Webpack killing the CPU" | Stan Hu | 2018-03-25 | 2 | -2/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit ec2aa7063496a3a5ead3ab93e5b8d65ba5fad2be. | ||||
| | * | | | | | | Add fsevents as a dev dependency to avoid Webpack killing the CPU | Stan Hu | 2018-03-23 | 2 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #33886 | ||||
| * | | | | | | | Merge branch 'contribute/issues-merge-requests-dashboard-choice' into 'master' | Douwe Maan | 2018-03-27 | 7 | -9/+48 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'Assigned Issues' and 'Assigned Merge Requests' as dashboard user choices Closes #42180 See merge request gitlab-org/gitlab-ce!17860 | ||||
| | * | | | | | | | 'Assigned Issues' and 'Assigned Merge Requests' as dashboard user choices | Elias Werberich | 2018-03-27 | 7 | -9/+48 |
| |/ / / / / / / | |||||
| * | | | | | | | Update CHANGELOG.md for 10.6.1 | Filipa Lacerda | 2018-03-27 | 6 | -25/+20 |
| | | | | | | | | | | | | | | | | | | | | | | [ci skip] | ||||
| * | | | | | | | Merge branch 'workhorse-gitaly-mandatory' into 'master' | Sean McGivern | 2018-03-27 | 3 | -8/+13 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make all workhorse gitaly calls opt-out See merge request gitlab-org/gitlab-ce!18002 | ||||
| | * | | | | | | | Make all workhorse gitaly calls opt-out | Jacob Vosmaer (GitLab) | 2018-03-27 | 3 | -8/+13 |
| |/ / / / / / / | |||||
| * | | | | | | | Merge branch 'patch-28' into 'master' | Sean McGivern | 2018-03-27 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | Fixed typos See merge request gitlab-org/gitlab-ce!18012 | ||||
| | * | | | | | | Fixed typos | Pascal Borreli | 2018-03-27 | 1 | -2/+2 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'test-hook-logs-xss' into 'master' | Douwe Maan | 2018-03-27 | 1 | -0/+21 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a test to make sure there's no XSS for hook logs See merge request gitlab-org/gitlab-ce!18005 | ||||
| | * | | | | | | | Add a test to make sure there's no XSS for hook logstest-hook-logs-xss | Lin Jen-Shin | 2018-03-27 | 1 | -0/+21 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch '43512-add-support-for-omniauth-jwt-provider' into 'master' | Douwe Maan | 2018-03-27 | 6 | -1/+105 |
| |\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Add support for omniauth-jwt provider" Closes #43512 See merge request gitlab-org/gitlab-ce!17774 | ||||
| | * | | | | | | | Clarify what auth_url should be | Achilleas Pipinellis | 2018-03-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] | ||||
| | * | | | | | | | Copyedit JWT docs | Achilleas Pipinellis | 2018-03-26 | 3 | -75/+73 |
| | | | | | | | | | |||||
| | * | | | | | | | Adds JWT omnianuth integration | Tiago Botelho | 2018-03-20 | 6 | -1/+107 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch '5347-fix-multiple-clusters-incorrect-details-injected' into ↵ | Kamil Trzciński | 2018-03-27 | 7 | -12/+26 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Port to CE: Resolve "Multiple clusters: incorrect cluster details injected - environment scope is ignored" See merge request gitlab-org/gitlab-ce!17904 | ||||
| | * | | | | | | | | Re-arrange deployment_platform to avoid cop complainments5347-fix-multiple-clusters-incorrect-details-injected | Mayra Cabrera | 2018-03-26 | 1 | -4/+10 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Rearrange DeploymentPlatform methods | Mayra Cabrera | 2018-03-22 | 7 | -9/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Change find_cluster_platform_kubernetes to ignore environment argument - Fix broken specs CE Port of: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/5047/ | ||||
| * | | | | | | | | | Merge branch '40781-os-to-ce' into 'master' | Sean McGivern | 2018-03-27 | 104 | -230/+3867 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bring Object Storage to CE Closes #4171, #4163, #3370, #2841, and #29203 See merge request gitlab-org/gitlab-ce!17358 | ||||
| | * | | | | | | | | | remove some lint | Micaël Bergeron | 2018-03-26 | 5 | -5/+1 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | personal snippets will now comply with `background_upload` | Micaël Bergeron | 2018-03-26 | 3 | -1/+12 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | remove lint | Micaël Bergeron | 2018-03-22 | 1 | -4/+5 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | fix the api jobs spec from having EE specific tests | Micaël Bergeron | 2018-03-22 | 1 | -23/+0 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | fix the failing specs | Micaël Bergeron | 2018-03-22 | 7 | -7/+11 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Backport EE changes | Micaël Bergeron | 2018-03-22 | 2 | -0/+0 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | remove EE-only code | Micaël Bergeron | 2018-03-22 | 2 | -74/+0 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Merge branch '40781-os-to-ce' of gitlab.com:gitlab-org/gitlab-ce into ↵ | Micaël Bergeron | 2018-03-22 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 40781-os-to-ce | ||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |