summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Mock dispatch function in vuex action helperfe-actions-vuex-helperFilipa Lacerda2018-03-281-1/+22
* Merge branch 'docs/add-ci-trace-to-settings-and-configs' into 'master'Achilleas Pipinellis2018-03-272-0/+43
|\
| * Add info on CI job traces for adminsAchilleas Pipinellis2018-03-272-0/+43
* | Merge branch 'reduce-query-count-for-mergerequestscontroller-show' into 'master'Douwe Maan2018-03-273-10/+33
|\ \ | |/ |/|
| * Fix N+1 in `MergeRequest#merge_request_diff_for`reduce-query-count-for-mergerequestscontroller-showSean McGivern2018-03-213-10/+33
* | Merge branch 'remove-source-branch-docs' into 'master'Achilleas Pipinellis2018-03-272-0/+16
|\ \
| * | Added docs for removing source branchPhil Hughes2018-03-272-0/+16
|/ /
* | Merge branch 'docs-ee-5105-split_dependency_scanning_from_sast' into 'master'Achilleas Pipinellis2018-03-272-2/+20
|\ \
| * | Add documentation for Dependency Scanning featureOlivier Gonzalez2018-03-272-2/+20
|/ /
* | Merge branch 'docs-ci-docker-build-cache' into 'master'Achilleas Pipinellis2018-03-271-15/+76
|\ \
| * | Add Docker layer caching to CI docker-in-docker docsAthar Hameed2018-03-271-15/+76
|/ /
* | Merge branch 'jej/add-protected-branch-policy' into 'master'Nick Thomas2018-03-2716-22/+281
|\ \
| * | Revert exploratory branch restriction policyjej/add-protected-branch-policyJames Edwards-Jones2018-03-262-54/+6
| * | API uses ProtectedBranchPolicy for destroy/createJames Edwards-Jones2018-03-262-4/+35
| * | ProtectedBranchPolicy used from Controller for destroy/updateJames Edwards-Jones2018-03-267-4/+97
| * | DestroyService for protected tags/branches used from controllerJames Edwards-Jones2018-03-269-14/+122
| * | Branch unprotection restriction starting pointJames Edwards-Jones2018-03-263-1/+76
* | | Merge branch 'ab-44467-remove-index' into 'master'Yorick Peterse2018-03-273-2/+24
|\ \ \
| * | | Remove unused index from events table.Andreas Brandl2018-03-273-2/+24
* | | | Merge branch 'update-docs-mr-template' into 'master'Marcia Ramos2018-03-271-7/+20
|\ \ \ \
| * | | | Update the Documentation MR templateupdate-docs-mr-templateAchilleas Pipinellis2018-03-271-7/+20
* | | | | Merge branch 'ide-ui-theme' into 'master'Tim Zallmann2018-03-272-34/+93
|\ \ \ \ \
| * | | | | Added web IDE to GitLab theme definitionide-ui-themePhil Hughes2018-03-232-34/+93
* | | | | | Merge branch 'sh-add-fsevents-dev-dependency' into 'master'Mike Greiling2018-03-272-1/+4
|\ \ \ \ \ \
| * | | | | | Install fsevents as an optional dependency in package.jsonsh-add-fsevents-dev-dependencyStan Hu2018-03-252-1/+4
| * | | | | | Revert "Add fsevents as a dev dependency to avoid Webpack killing the CPU"Stan Hu2018-03-252-2/+1
| * | | | | | Add fsevents as a dev dependency to avoid Webpack killing the CPUStan Hu2018-03-232-1/+2
* | | | | | | Merge branch 'contribute/issues-merge-requests-dashboard-choice' into 'master'Douwe Maan2018-03-277-9/+48
|\ \ \ \ \ \ \
| * | | | | | | 'Assigned Issues' and 'Assigned Merge Requests' as dashboard user choicesElias Werberich2018-03-277-9/+48
|/ / / / / / /
* | | | | | | Update CHANGELOG.md for 10.6.1Filipa Lacerda2018-03-276-25/+20
* | | | | | | Merge branch 'workhorse-gitaly-mandatory' into 'master'Sean McGivern2018-03-273-8/+13
|\ \ \ \ \ \ \
| * | | | | | | Make all workhorse gitaly calls opt-outJacob Vosmaer (GitLab)2018-03-273-8/+13
|/ / / / / / /
* | | | | | | Merge branch 'patch-28' into 'master'Sean McGivern2018-03-271-2/+2
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Fixed typosPascal Borreli2018-03-271-2/+2
* | | | | | | Merge branch 'test-hook-logs-xss' into 'master'Douwe Maan2018-03-271-0/+21
|\ \ \ \ \ \ \
| * | | | | | | Add a test to make sure there's no XSS for hook logstest-hook-logs-xssLin Jen-Shin2018-03-271-0/+21
* | | | | | | | Merge branch '43512-add-support-for-omniauth-jwt-provider' into 'master'Douwe Maan2018-03-276-1/+105
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Clarify what auth_url should beAchilleas Pipinellis2018-03-271-1/+1
| * | | | | | | Copyedit JWT docsAchilleas Pipinellis2018-03-263-75/+73
| * | | | | | | Adds JWT omnianuth integrationTiago Botelho2018-03-206-1/+107
* | | | | | | | Merge branch '5347-fix-multiple-clusters-incorrect-details-injected' into 'ma...Kamil Trzciński2018-03-277-12/+26
|\ \ \ \ \ \ \ \
| * | | | | | | | Re-arrange deployment_platform to avoid cop complainments5347-fix-multiple-clusters-incorrect-details-injectedMayra Cabrera2018-03-261-4/+10
| * | | | | | | | Rearrange DeploymentPlatform methodsMayra Cabrera2018-03-227-9/+17
* | | | | | | | | Merge branch '40781-os-to-ce' into 'master'Sean McGivern2018-03-27104-230/+3867
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | remove some lintMicaël Bergeron2018-03-265-5/+1
| * | | | | | | | | personal snippets will now comply with `background_upload`Micaël Bergeron2018-03-263-1/+12
| * | | | | | | | | remove lintMicaël Bergeron2018-03-221-4/+5
| * | | | | | | | | fix the api jobs spec from having EE specific testsMicaël Bergeron2018-03-221-23/+0
| * | | | | | | | | fix the failing specsMicaël Bergeron2018-03-227-7/+11
| * | | | | | | | | Backport EE changesMicaël Bergeron2018-03-222-0/+0