summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | | | | Merge branch 'doc_api_events' into 'master'Evan Read2019-08-271-6/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update doc/api/events.md See merge request gitlab-org/gitlab-ce!32071
| * | | | | | | | | | | | | | | | | 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 rules See merge request gitlab-org/gitlab-ce!32026
| * | | | | | | | | | | | | | | | | 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 working Closes #66627 See merge request gitlab-org/gitlab-ce!32234
| * | | | | | | | | | | | | | | | Fix Piwik not workingsh-fix-piwik-templateStan Hu2019-08-263-2/+27
| | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to indentation, the changes in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/31402 broke the templating of Piwik script header. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/66627
* | | | | | | | | | | | | | | | Merge branch 'sh-guard-against-orphaned-project-feature' into 'master'Michael Kozono2019-08-263-0/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Guard against deleted project feature entry Closes #66482 See merge request gitlab-org/gitlab-ce!32187
| * | | | | | | | | | | | | | | | Guard against deleted project feature entryStan Hu2019-08-263-0/+20
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In https://gitlab.com/gitlab-org/gitlab-ce/issues/66482, we see that a project's `project_feature` association may be lazily loaded and hence return `nil` if the entry is deleted if the `Project` is already loaded in memory. To ensure we don't fail hard when this happens, assume all features are disabled. We can fix this issue by eager loading the `project_feature` in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/32169, but we shouldn't have to depend on that. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/66482
* | | | | | | | | | | | | | | | Merge branch 'revert-e2251a09' into 'master'Mayra Cabrera2019-08-268-204/+105
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'user-tracking-settings' into 'master'" See merge request gitlab-org/gitlab-ce!32235
| * | | | | | | | | | | | | | | | Revert "Merge branch 'user-tracking-settings' into 'master'"Jeremy Jackson2019-08-268-204/+105
|/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts merge request !31826
* | | | | | | | | | | | | | | | Merge branch 'ab-codeowners-database' into 'master'Mayra Cabrera2019-08-261-6/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change database codeowners to database maintainer group See merge request gitlab-org/gitlab-ce!32229
| * | | | | | | | | | | | | | | | Change database maintainers group for codeownersAndreas Brandl2019-08-261-6/+7
|/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Aligning with backend maintainers, @gitlab-org/maintainers/database is now used for codeowners.
* | | | | | | | | | | | | | | | Merge branch 'setting_mirror_repos_too_big' into 'master'Tim Zallmann2019-08-262-5/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | apps: remove the too big "Mirror a repository" header Closes #66445 See merge request gitlab-org/gitlab-ce!32097
| * | | | | | | | | | | | | | | locale: remove unused "Mirror a repository" entryNeroBurner2019-08-231-3/+0
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | apps: remove the too big "Mirror a repository" headerNeroBurner2019-08-221-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/66445
* | | | | | | | | | | | | | | | Merge branch 'docs/53811-move-multiple-issue-boards-to-free-and-core' into ↵Achilleas Pipinellis2019-08-263-22/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Added note that Multiple Issue Boards moved tiers. See merge request gitlab-org/gitlab-ce!31829
| * | | | | | | | | | | | | | | | Added note that Multiple Issue Boards moved tiers.Russell Dickenson2019-08-263-22/+14
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'patch-74' into 'master'Mike Greiling2019-08-262-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix: remove double % See merge request gitlab-org/gitlab-ce!32178
| * | | | | | | | | | | | | | | | fix: remove double % from layout width descriptionВладислав Поляков2019-08-242-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update show.html.haml
* | | | | | | | | | | | | | | | | Merge branch 'docs-jv-gitaly-concurrency-limiter' into 'master'Achilleas Pipinellis2019-08-261-0/+41
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add documentation about Gitaly concurrency limiter See merge request gitlab-org/gitlab-ce!31902
| * | | | | | | | | | | | | | | | | Add documentation about Gitaly concurrency limiterJacob Vosmaer2019-08-261-0/+41
|/ / / / / / / / / / / / / / / / /