summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix admin settings specdz-improve-app-settings-2Dmitriy Zaporozhets2018-03-271-1/+1
* Move ci/cd, influx and prometheus app settings to expandable sectionsDmitriy Zaporozhets2018-03-277-138/+207
* 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
| * | | | | remove EE-only codeMicaël Bergeron2018-03-222-74/+0
| * | | | | Merge branch '40781-os-to-ce' of gitlab.com:gitlab-org/gitlab-ce into 40781-o...Micaël Bergeron2018-03-221-1/+1
| |\ \ \ \ \
| | * | | | | Fix pipeline serializer specSean McGivern2018-03-151-1/+1
| * | | | | | Merge remote-tracking branch 'origin/master' into 40781-os-to-ceMicaël Bergeron2018-03-221133-7137/+23384
| |\ \ \ \ \ \
| * | | | | | | apply feedbackMicaël Bergeron2018-03-221-7/+0
| * | | | | | | Fix http_io to make it return path is nilShinya Maeda2018-03-221-1/+1
| * | | | | | | Backport ee-40781-os-to-ceMicaël Bergeron2018-03-2212-60/+147
| | |/ / / / / | |/| | | | |
| * | | | | | fix an indentation problemMicaël Bergeron2018-03-121-1/+1
| * | | | | | Merge branch '40781-os-to-ce' of gitlab.com:gitlab-org/gitlab-ce into ce-4078...Micaël Bergeron2018-03-098-77/+17
| |\ \ \ \ \ \
| | * | | | | | apply feedbackMicaël Bergeron2018-03-098-77/+17
| * | | | | | | Add proxy_download to perform proxied sending of all filesMicaël Bergeron2018-03-0915-26/+180
| |/ / / / / /
| * | | | | | Merge remote-tracking branch 'origin/master' into 40781-os-to-ceMicaël Bergeron2018-03-081369-19699/+47701
| |\ \ \ \ \ \
| * | | | | | | [cherry-pick] '4862-verify-file-checksums'Sean McGivern2018-03-0816-11/+423
| * | | | | | | Merge branch 'poc-upload-hashing-path' into 'master'Sean McGivern2018-03-086-47/+70
| * | | | | | | fix specsMicaël Bergeron2018-03-073-24/+0
| * | | | | | | [ci-skip] add the CE changelog and remove the EE changelogsMicaël Bergeron2018-03-0711-51/+5
| * | | | | | | fix yet other specsMicaël Bergeron2018-03-073-22/+30
| * | | | | | | fix some broken specsMicaël Bergeron2018-03-068-43/+31
| * | | | | | | fixing some broken mergesMicaël Bergeron2018-03-026-39/+5
| * | | | | | | another round of EE code removalMicaël Bergeron2018-03-028-269/+75
| * | | | | | | remove geo specific codeMicaël Bergeron2018-03-0116-1493/+76