summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Bring text mail for new issue & MR more in linetc-cleanup-issue-created-text-mailToon Claes2019-08-273-9/+10
| | | | | | | Make these templates for mail notifications for a new issue and a new merge request more similar. Also remove some leading whitespace in text mails.
* Merge branch 'docs/fix-linting-problems' into 'master'Kushal Pandya2019-08-271-5/+5
|\ | | | | | | | | Removes trailing whitespace to fix linting See merge request gitlab-org/gitlab-ce!32265
| * Removes trailing whitespace to fix lintingEvan Read2019-08-271-5/+5
|/
* Merge branch '13806-fix' into 'master'Lin Jen-Shin2019-08-272-2/+13
|\ | | | | | | | | | | | | Add nil check for Gitlab.config.prometheus Closes #13806 See merge request gitlab-org/gitlab-ce!32201
| * Add nil check for Gitlab.config.prometheus13806-fixrpereira22019-08-262-2/+13
| |
* | Merge branch 'docs-update-needs-example' into 'master'Kamil Trzciński2019-08-271-4/+4
|\ \ | | | | | | | | | | | | Update the syntax of DAG example See merge request gitlab-org/gitlab-ce!32137
| * | Update syntax of needs exampledocs-update-needs-exampleAlexander Tanayno2019-08-231-4/+4
| | |
* | | Merge branch 'nik-db-migrations-prefer-atomic-docs' into 'master'Evan Read2019-08-272-44/+99
|\ \ \ | | | | | | | | | | | | | | | | Update DB migrations style guide: prefer atomic migrations when possible See merge request gitlab-org/gitlab-ce!31915
| * | | Migrations guide: use atomic steps, when possibleMayra Cabrera2019-08-272-44/+99
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, the DB migrations guide says that "you must" use non-blocking operations (such as CREATE INDEX CONCURRENTLY), always. But this does not make sense in cases of empty tables and leads to splitting the work to multiple non-atomic (with disable_ddl_transaction!) DB migrations. To follow KISS principle, to have fewer DB migrations steps, to have them atomic when it's possible and simplify deployment and troubleshooting, the following exceptions were added to the doc: - index creation, - index dropping, - defining an FK, - adding a column with DEFAULT,
* | | Merge branch 'docs/markdownlint-before-nanoc' into 'master'Evan Read2019-08-271-2/+3
|\ \ \ | | | | | | | | | | | | | | | | Run markdownlint before Nanoc checks See merge request gitlab-org/gitlab-ce!32256
| * | | Run markdownlint before Nanoc checksAchilleas Pipinellis2019-08-271-2/+3
|/ / / | | | | | | | | | | | | Make it simpler to run markdownlint by moving it before we do those hacks to run Nanoc.
* | | Merge branch '57657-promote-label-to-group-label-via-api-endpoint' into 'master'Sean McGivern2019-08-274-0/+113
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Promote Label to Group Label via API endpoint Closes #57657 See merge request gitlab-org/gitlab-ce!25218
| * | | 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 flags See merge request gitlab-org/gitlab-ce!32217
| * | | | Update index of feature flagsSeth Berger2019-08-271-2/+2
|/ / / / | | | | | | | | | | | | | | | | Made it clear the pages are about feature flags, and not documentation.
* | | | Merge branch 'docs-capitalization-2' into 'master'Achilleas Pipinellis2019-08-2722-95/+93
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Update capitalization in /dev docs See merge request gitlab-org/gitlab-ce!32189
| * | | | Update capitalization in /dev docsMarcel Amirault2019-08-2722-95/+93
|/ / / / | | | | | | | | | | | | | | | | Clean up capitalization in /development /gitlab-basics and /install
* | | | Merge branch 'docs-capitalization-3' into 'master'Achilleas Pipinellis2019-08-2735-79/+82
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Update capitalization in /integrations and /raketasks See merge request gitlab-org/gitlab-ce!32241
| * | | | Update capitalization in /integrations and /raketasksMarcel Amirault2019-08-2735-79/+82
|/ / / / | | | | | | | | | | | | Also updates redirect text in /project-services
* | | | Merge branch 'sh-project-feature-nplus-one' into 'master'Jan Provaznik2019-08-273-0/+28
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove N+1 SQL query loading project feature in dashboard Closes #66482 See merge request gitlab-org/gitlab-ce!32169
| * | | | Remove N+1 SQL query loading project feature in dashboardsh-project-feature-nplus-oneStan Hu2019-08-233-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Projects that have a pipeline may need to check whether the user has permission to read the build (`can?(current_user, :read_build, project)`), which requires checking the `project_features` table. This would cause an N+1 SQL query for each project. This change also has a beneficial side effect that may avoid a race condition. When a user deletes a project, the project is queued for deletion and the user is redirected back to the dashboard page. However, the following may happen: 1. The dashboard page may load this deleted project in the list of 20 projects. 2. The view will load the project pipeline status from the cache and attempt to show each project. 3. When the view encounters the deleted project, it calls `can?(current_user, :read_build, project)` to determine whether to display the pipeline status. 4. Sidekiq deletes the project from the database. 5. However, since the deleted project is still loaded in memory, it will attempt to call `project.project_feature.access_level`. 6. Since `project_feature` was not eager loaded, a lazy `SELECT` call is made to the database. 7. This `SELECT` call returns nothing, and the user sees a 500 error. By eager loading `project_feature`, we can ensure that we have a consistent view and avoid records from being deleted later. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/66482
* | | | | Merge branch 'patch-25' into 'master'Evan Read2019-08-271-0/+23
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [#2838] add cache override explanation See merge request gitlab-org/gitlab-ce!32024
| * | | | | [#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 form See merge request gitlab-org/gitlab-ce!32116
| * | | | | 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 passing tests from quarantine Closes gitlab-org/quality/nightly#127 See merge request gitlab-org/gitlab-ce!32237
| * | | | | 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 doc See merge request gitlab-org/gitlab-ce!32250
| * | | | | | 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
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Store deploy tokens encrypted" Closes #63502 See merge request gitlab-org/gitlab-ce!30679
| * | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added migrations to make token column accepting null values and to add encrypted token column.
* | | | | | | Merge branch 'feature-branch-gather-jobs-data' into 'master'Stan Hu2019-08-2714-451/+474
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduce the complexity of our CI configuration Closes #51367 and #65702 See merge request gitlab-org/gitlab-ce!31728
| * | | | | | | Reduce complexity of CI filesfeature-branch-gather-jobs-dataStan Hu2019-08-2614-451/+474
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | Merge branch 'oauth_bypass_two_factor' into 'master'Michael Kozono2019-08-277-5/+70
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add option to allow OAuth providers to bypass two factor Closes #56059 See merge request gitlab-org/gitlab-ce!31996
| * | | | | | | | Update docs and comments about saml with allow_bypass_two_factordodocat2019-08-277-5/+70
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | allow_bypass_two_factor configration dose not work with saml provider
* | | | | | | | Merge branch 'docs-no-more-k8s-service-template' into 'master'Evan Read2019-08-271-3/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Remove mention of Kubernetes service templates See merge request gitlab-org/gitlab-ce!32093
| * | | | | | | | Remove mention of Kubernetes service templatesdocs-no-more-k8s-service-templateThong Kuah2019-08-221-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | This has since been removed