summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Use `stub_full_request` to fix spec failure66641-broken-master-real-http-connections-are-disabled-unregistered-requestHeinrich Lee Yu2019-08-273-16/+24
* Merge branch '57657-promote-label-to-group-label-via-api-endpoint' into 'master'Sean McGivern2019-08-274-0/+113
|\
| * Incorporate review feedbackRobert Schilling2019-08-261-9/+9
| * Make tests passRobert Schilling2019-08-261-10/+12
| * Update docs targeting 12.3Robert Schilling2019-08-262-2/+2
| * Move promote to put and add more specsRobert Schilling2019-08-263-8/+32
| * Add docs and first specsRobert Schilling2019-08-263-3/+60
| * API: Promote project labels to group labelsRobert Schilling2019-08-262-0/+30
* | Merge branch 'docs-sethgitlab-featureflags' into 'master'Achilleas Pipinellis2019-08-271-2/+2
|\ \
| * | Update index of feature flagsSeth Berger2019-08-271-2/+2
|/ /
* | Merge branch 'docs-capitalization-2' into 'master'Achilleas Pipinellis2019-08-2722-95/+93
|\ \
| * | Update capitalization in /dev docsMarcel Amirault2019-08-2722-95/+93
|/ /
* | Merge branch 'docs-capitalization-3' into 'master'Achilleas Pipinellis2019-08-2735-79/+82
|\ \
| * | Update capitalization in /integrations and /raketasksMarcel Amirault2019-08-2735-79/+82
|/ /
* | Merge branch 'sh-project-feature-nplus-one' into 'master'Jan Provaznik2019-08-273-0/+28
|\ \
| * | Remove N+1 SQL query loading project feature in dashboardsh-project-feature-nplus-oneStan Hu2019-08-233-0/+28
* | | Merge branch 'patch-25' into 'master'Evan Read2019-08-271-0/+23
|\ \ \
| * | | [#2838] add cache override explanationJace Bennest2019-08-271-0/+23
|/ / /
* | | Merge branch 'patch-73' into 'master'Evan Read2019-08-271-1/+1
|\ \ \
| * | | Update `only` `chat` statement to correct singular formDaniel Gruesso2019-08-271-1/+1
|/ / /
* | | Merge branch 'qa-ml-dequarantine-tests' into 'master'Ramya Authappan2019-08-272-4/+2
|\ \ \
| * | | Remove tests from quarantineqa-ml-dequarantine-testsMark Lapierre2019-08-272-4/+2
* | | | Merge branch 'docs-fix-omniauth-line' into 'master'Evan Read2019-08-271-0/+1
|\ \ \ \
| * | | | Add missing blank line to omniauth docMarcel Amirault2019-08-271-0/+1
|/ / / /
* | | | Merge branch '63502-encrypt-deploy-token' into 'master'Stan Hu2019-08-2710-7/+125
|\ \ \ \
| * | | | Add limit: 255 to token_ecnrypted column63502-encrypt-deploy-tokenStan Hu2019-08-262-2/+2
| * | | | Removed rubocop disable flags, updated changelogEtienne Baqué2019-08-262-4/+2
| * | | | Added new index to deploy_tokens tableEtienne Baqué2019-08-262-0/+18
| * | | | Updated call to find deploy tokenEtienne Baqué2019-08-262-3/+3
| * | | | Iterating through token to encrypt with find_eachEtienne Baqué2019-08-261-2/+2
| * | | | Added changelog file for this security fixEtienne Baqué2019-08-262-0/+5
| * | | | Add encrypted optional option to DeployToken authentication fieldEtienne Baqué2019-08-262-1/+1
| * | | | Added EncryptDeployTokensTokens spec fileEtienne Baqué2019-08-261-0/+47
| * | | | Added migration to encrypt token in DeployToken recordsEtienne Baqué2019-08-264-1/+51
* | | | | Merge branch 'feature-branch-gather-jobs-data' into 'master'Stan Hu2019-08-2714-451/+474
|\ \ \ \ \
| * | | | | Reduce complexity of CI filesfeature-branch-gather-jobs-dataStan Hu2019-08-2614-451/+474
* | | | | | Merge branch 'oauth_bypass_two_factor' into 'master'Michael Kozono2019-08-277-5/+70
|\ \ \ \ \ \
| * | | | | | Update docs and comments about saml with allow_bypass_two_factordodocat2019-08-277-5/+70
|/ / / / / /
* | | | | | Merge branch 'docs-no-more-k8s-service-template' into 'master'Evan Read2019-08-271-3/+2
|\ \ \ \ \ \
| * | | | | | Remove mention of Kubernetes service templatesdocs-no-more-k8s-service-templateThong Kuah2019-08-221-3/+2
* | | | | | | Merge branch 'doc_api_events' into 'master'Evan Read2019-08-271-6/+6
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Update doc/api/events.mdAlexis Sánchez2019-08-271-6/+6
|/ / / / / /
* | | | | | Merge branch 'ci-job-rules-docs' into 'master'Evan Read2019-08-271-0/+120
|\ \ \ \ \ \
| * | | | | | CI Yaml configuration docs for using job rulesdrew2019-08-271-0/+120
|/ / / / / /
* | | | | | Merge branch 'sh-fix-piwik-template' into 'master'Ash McKenzie2019-08-273-2/+27
|\ \ \ \ \ \
| * | | | | | Fix Piwik not workingsh-fix-piwik-templateStan Hu2019-08-263-2/+27
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'sh-guard-against-orphaned-project-feature' into 'master'Michael Kozono2019-08-263-0/+20
|\ \ \ \ \ \
| * | | | | | Guard against deleted project feature entryStan Hu2019-08-263-0/+20
* | | | | | | Merge branch 'revert-e2251a09' into 'master'Mayra Cabrera2019-08-268-204/+105
|\ \ \ \ \ \ \
| * | | | | | | Revert "Merge branch 'user-tracking-settings' into 'master'"Jeremy Jackson2019-08-268-204/+105
|/ / / / / / /
View Lorry Controller Status