summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Code review comments appliedfj-174-better-ldap-connection-handlingFrancisco Javier López2018-04-036-9/+16
* Cleaning some codeFrancisco Javier López2018-04-035-14/+12
* Added changelog [ci skip]Francisco Javier López2018-04-031-0/+5
* Added a specFrancisco Javier López2018-04-021-0/+16
* Small refactoringFrancisco Javier López2018-04-022-4/+4
* Changed again the approachFrancisco Javier López2018-04-024-17/+48
* Trying another approachFrancisco Javier López2018-04-026-29/+26
* Forgot to remove some debugging and fixed a typoFrancisco Javier López2018-03-302-2/+1
* Trying different approachFrancisco Javier López2018-03-306-10/+36
* Trying to fix specsFrancisco Javier López2018-03-301-3/+3
* Adding debugg to see if specs succeedFrancisco Javier López2018-03-291-0/+2
* Removing unnecessary code [ci skip]Francisco Javier López2018-03-291-4/+0
* Added newline [ci skip]Francisco Javier López2018-03-291-0/+1
* Fixed specsFrancisco Javier López2018-03-291-5/+25
* Adding retriesFrancisco Javier López2018-03-291-10/+26
* Remocing toxiproxyFrancisco Javier López2018-03-293-17/+10
* BackupFrancisco Javier López2018-03-283-7/+10
* Not blocking users if the connection times outFrancisco Javier López2018-03-284-15/+28
* 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
View Lorry Controller Status